ソースを参照

修改條件查詢

yumeng 5 年 前
コミット
82ecf237f5

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

@@ -84,8 +84,11 @@ public class AdvertiserController {
 
         Result<IPage<Advertiser>> result = new Result<IPage<Advertiser>>();
         String roleCode = materialReportMapper.getRoleCodeByUserId(advertiser.getUserId());
+        if ("admin".equals(roleCode) || "kuaishouOperationManager".equals(roleCode)) {
+            advertiser.setUserId(null);
+        }
         QueryWrapper<Advertiser> queryWrapper = QueryGenerator.initQueryWrapper(advertiser, req.getParameterMap());
-        if (!"admin".equals(roleCode) && !Check.isNull(roleCode)) {
+        if (!"admin".equals(roleCode) && !"kuaishouOperationManager".equals(roleCode)) {
             QueryWrapper<UserCompany> userCompanyQueryWrapper = new QueryWrapper<>();
             userCompanyQueryWrapper.eq("user_id", advertiser.getUserId());
             userCompanyQueryWrapper.orderByDesc("create_time");

+ 1 - 1
jeecg-boot-module-system/src/main/java/org/jeecg/modules/ctop/controller/ProjectMemberController.java

@@ -102,7 +102,7 @@ public class ProjectMemberController {
         try {
             QueryWrapper<ProjectMember> queryWrapper = new QueryWrapper<>();
             String roleCode = materialReportMapper.getRoleCodeByUserId(userId);
-            if (!roleCode.equals("admin") || !roleCode.equals("kuaishouOperationManager")) {
+            if (!"admin".equals(roleCode) && !"kuaishouOperationManager".equals(roleCode)) {
                 queryWrapper.eq("user_id", userId);
 
             }