Sfoglia il codice sorgente

查询产品接口。。。修改bug

zhaoxian 3 anni fa
parent
commit
ece254297c

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

@@ -98,7 +98,7 @@ public class ProjectMemberController {
         try {
             QueryWrapper<ProjectMember> queryWrapper = new QueryWrapper<>();
             String roleCode = sysRoleService.getRoleCodeByUserId(userId);
-            if (!"admin".equals(roleCode) && !roleCode.contains("sale") && !"meidaManager".equals(roleCode)) {
+            if (!"admin".equals(roleCode) && !"sale".contains(roleCode) && !"meidaManager".equals(roleCode)) {
                 queryWrapper.eq("user_id", userId);
             }
             queryWrapper.groupBy("project_id");
@@ -169,7 +169,7 @@ public class ProjectMemberController {
             //查询用户角色
             String roleCode = sysRoleService.getRoleCodeByUserId(userId);
             //角色为 管理员 || 销售 || 媒介 查询全部
-            if ("admin".equals(roleCode) || roleCode.contains("sale") || "meidaManager".equals(roleCode)) {
+            if ("admin".equals(roleCode) || "sale".contains(roleCode) || "meidaManager".equals(roleCode)) {
                 userId = null;
             }
             //查询项目信息以及广告主
@@ -199,6 +199,9 @@ public class ProjectMemberController {
                 for (JSONObject object : list) {
                     List<JSONObject> proList = new ArrayList<>();
                     for (JSONObject have : haveList) {
+                        if(Check.isNull(have)){
+                            continue;
+                        }
                         if (Check.isNull(have.getLong("productId"))) {
                             continue;
                         }
@@ -237,7 +240,7 @@ public class ProjectMemberController {
             //查询用户角色
             String roleCode = sysRoleService.getRoleCodeByUserId(userId);
             //角色为 管理员 || 销售 || 媒介 查询全部
-            if ("admin".equals(roleCode) || roleCode.contains("sale") || "meidaManager".equals(roleCode)) {
+            if ("admin".equals(roleCode) || "sale".contains(roleCode) || "meidaManager".equals(roleCode)) {
                 userId = null;
             }
             //查询项目信息以及广告主
@@ -253,6 +256,9 @@ public class ProjectMemberController {
                 for (JSONObject object : list) {
                     List<JSONObject> proList = new ArrayList<>();
                     for (JSONObject have : projectList) {
+                        if(Check.isNull(have)){
+                            continue;
+                        }
                         if (Check.isNull(have.getLong("productId"))) {
                             continue;
                         }
@@ -302,7 +308,7 @@ public class ProjectMemberController {
             //查询用户角色
             String roleCode = sysRoleService.getRoleCodeByUserId(userId);
             //角色为 管理员 || 销售 || 媒介 查询全部
-            if ("admin".equals(roleCode) || roleCode.contains("sale") || "meidaManager".equals(roleCode)) {
+            if ("admin".equals(roleCode) || "sale".contains(roleCode) || "meidaManager".equals(roleCode)) {
                 userId = null;
             }
             //查询项目信息以及广告主
@@ -339,7 +345,7 @@ public class ProjectMemberController {
         try {
 
             String roleCode = sysRoleService.getRoleCodeByUserId(userId);
-            if ("admin".equals(roleCode) || roleCode.contains("sale") || "meidaManager".equals(roleCode)) {
+            if ("admin".equals(roleCode) || "sale".contains(roleCode) || "meidaManager".equals(roleCode)) {
                 List<Project> projects = projectService.list();
                 result.put("data", projects);
                 ResultMapUtils.setResultMap(result, StatusCode.COMMON_SUCCESS);
@@ -376,7 +382,7 @@ public class ProjectMemberController {
         projectMember.setProductId(null);
         QueryWrapper<ProjectMember> queryWrapper = QueryGenerator.initQueryWrapper(projectMember, req.getParameterMap());
         String roleCode = sysRoleService.getRoleCodeByUserId(userId);
-        if (!"admin".equals(roleCode) && !roleCode.contains("sale") && !"meidaManager".equals(roleCode)) {
+        if (!"admin".equals(roleCode) && !"sale".contains(roleCode) && !"meidaManager".equals(roleCode)) {
             queryWrapper.eq("user_id", userId);
         }
         if (!Check.isNull(projectName)) {
@@ -617,7 +623,7 @@ public class ProjectMemberController {
         List<Integer> mediaIds = new ArrayList<>();
         mediaIds.add(1);
         mediaIds.add(3);
-        List<ProjectMember> projectMemberList = projectMemberService.getProjects(mediaIds,userId);
+        List<ProjectMember> projectMemberList = projectMemberService.getProjects(mediaIds, userId);
         if (projectMemberList == null) {
             result.error500("未找到对应实体");
         } else {