yumeng 1 dia atrás
pai
commit
16c0417317

+ 7 - 4
jeecg-boot-module-system/src/main/java/org/jeecg/modules/ctop/controller/AdvertiserController.java

@@ -137,21 +137,24 @@ public class AdvertiserController {
     @GetMapping(value = "/list")
     public Result<IPage<Advertiser>> queryPageList(Advertiser advertiser,
                                                    @RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo,
-                                                   @RequestParam(name = "pageSize", defaultValue = "1000") Integer pageSize,
+                                                   @RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize,
                                                    HttpServletRequest req) {
         Result<IPage<Advertiser>> result = new Result<>();
         String userId = advertiser.getUserId();
         advertiser.setUserId(null);
-        String roleCode = sysRoleService.getRoleCodeByUserId(userId);
+        String roleCode = null;
+        if (!Check.isNull(userId)) {
+            roleCode = sysRoleService.getRoleCodeByUserId(userId);
+        }
 
 
         String name = advertiser.getName();
         advertiser.setName(null);
         QueryWrapper<Advertiser> queryWrapper = QueryGenerator.initQueryWrapper(advertiser, req.getParameterMap());
         if (!Check.isNull(name)) {
-            queryWrapper.like("name", name);
+            queryWrapper.like("name", name.trim());
         }
-        if (!"admin".equals(roleCode)) {
+        if (!Check.isNull(userId) && !"admin".equals(roleCode)) {
             QueryWrapper<UserCompany> userCompanyQueryWrapper = new QueryWrapper<>();
             userCompanyQueryWrapper.eq("user_id", userId);
             userCompanyQueryWrapper.orderByDesc("create_time");

+ 4 - 3
jeecg-boot-module-system/src/main/java/org/jeecg/modules/ctop/controller/ProductController.java

@@ -79,7 +79,6 @@ public class ProductController {
                                                 @RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo,
                                                 @RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize,
                                                 HttpServletRequest req) {
-        pageSize+=10000;// 页数太少 产品不能一次性全部查询出来
         Result<IPage<Product>> result = new Result<>();
         String productName = product.getProductName();
         product.setProductName(null);
@@ -88,7 +87,7 @@ public class ProductController {
 
         QueryWrapper<Product> queryWrapper = QueryGenerator.initQueryWrapper(product, req.getParameterMap());
         if (!Check.isNull(productName)) {
-            queryWrapper.like("product_name", productName);
+            queryWrapper.like("product_name", productName.trim());
         }
 
         if (!Check.isNull(userId)) {
@@ -99,7 +98,9 @@ public class ProductController {
                 userCompanyQueryWrapper.orderByDesc("create_time");
                 userCompanyQueryWrapper.last("limit 1");
                 UserCompany userCompany = userCompanyMapper.selectOne(userCompanyQueryWrapper);
-                queryWrapper.eq("company_id", userCompany.getCompanyId());
+                if (!Check.isNull(userCompany)) {
+                    queryWrapper.eq("company_id", userCompany.getCompanyId());
+                }
             }
             List<String> userIds = new ArrayList<>();
              if ("bytedanceDirector".equals(roleCode)) {