From 02f0716a1d7ea69e1c66738681b3e5edc5a07342 Mon Sep 17 00:00:00 2001 From: jiangping <jp@doumee.com> Date: 星期三, 20 九月 2023 10:37:09 +0800 Subject: [PATCH] sessionkey更换 --- server/service/src/main/java/com/doumee/service/business/impl/BrandServiceImpl.java | 7 ++++++- 1 files changed, 6 insertions(+), 1 deletions(-) diff --git a/server/service/src/main/java/com/doumee/service/business/impl/BrandServiceImpl.java b/server/service/src/main/java/com/doumee/service/business/impl/BrandServiceImpl.java index 56ef6a8..045762f 100644 --- a/server/service/src/main/java/com/doumee/service/business/impl/BrandServiceImpl.java +++ b/server/service/src/main/java/com/doumee/service/business/impl/BrandServiceImpl.java @@ -153,13 +153,14 @@ QueryWrapper<Brand> wrapper = new QueryWrapper<>(brand); wrapper.lambda().eq(Brand::getIsdeleted,Constants.ZERO); // wrapper.lambda().eq(Brand::getStatus,Constants.ZERO); + wrapper.lambda().orderByAsc(Brand::getType); wrapper.lambda().orderByAsc(Brand::getSortnum); // 绫诲瀷 0浼佷笟 1骞冲彴 if (Constants.equalsInteger(user.getType(), Constants.UserType.SYSTEM.getKey())) { wrapper.lambda().eq(Brand::getType,Constants.ONE); }else { wrapper.lambda().and(i->i.eq(Brand::getCompanyId,user.getCompanyId()) - .or().eq(Brand::getType,Constants.ZERO) + .or().eq(Brand::getType,Constants.ONE) ); } List<Brand> list = brandMapper.selectList(wrapper); @@ -186,6 +187,9 @@ if (pageWrap.getModel().getStatus() != null) { queryWrapper.lambda().eq(Brand::getStatus, pageWrap.getModel().getStatus()); } + if (pageWrap.getModel().getType() != null) { + queryWrapper.lambda().eq(Brand::getType, pageWrap.getModel().getType()); + } // 绫诲瀷 0浼佷笟 1骞冲彴 if (Objects.isNull(user.getCompanyId())) { queryWrapper.lambda().eq(Brand::getType,Constants.ONE); @@ -194,6 +198,7 @@ .or().eq(Brand::getType,Constants.ONE) ); } + queryWrapper.lambda().orderByAsc(Brand::getType); queryWrapper.lambda().orderByAsc(Brand::getSortnum); IPage<Brand> brandIPage = brandMapper.selectPage(page, queryWrapper); String prefixUrl = systemDictDataBiz.queryByCode(Constants.OSS, Constants.RESOURCE_PATH).getCode() -- Gitblit v1.9.3