|
@@ -98,7 +98,7 @@ public class ProjectMemberController {
|
|
try {
|
|
try {
|
|
QueryWrapper<ProjectMember> queryWrapper = new QueryWrapper<>();
|
|
QueryWrapper<ProjectMember> queryWrapper = new QueryWrapper<>();
|
|
String roleCode = sysRoleService.getRoleCodeByUserId(userId);
|
|
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.eq("user_id", userId);
|
|
}
|
|
}
|
|
queryWrapper.groupBy("project_id");
|
|
queryWrapper.groupBy("project_id");
|
|
@@ -169,7 +169,7 @@ public class ProjectMemberController {
|
|
//查询用户角色
|
|
//查询用户角色
|
|
String roleCode = sysRoleService.getRoleCodeByUserId(userId);
|
|
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;
|
|
userId = null;
|
|
}
|
|
}
|
|
//查询项目信息以及广告主
|
|
//查询项目信息以及广告主
|
|
@@ -199,6 +199,9 @@ public class ProjectMemberController {
|
|
for (JSONObject object : list) {
|
|
for (JSONObject object : list) {
|
|
List<JSONObject> proList = new ArrayList<>();
|
|
List<JSONObject> proList = new ArrayList<>();
|
|
for (JSONObject have : haveList) {
|
|
for (JSONObject have : haveList) {
|
|
|
|
+ if(Check.isNull(have)){
|
|
|
|
+ continue;
|
|
|
|
+ }
|
|
if (Check.isNull(have.getLong("productId"))) {
|
|
if (Check.isNull(have.getLong("productId"))) {
|
|
continue;
|
|
continue;
|
|
}
|
|
}
|
|
@@ -237,7 +240,7 @@ public class ProjectMemberController {
|
|
//查询用户角色
|
|
//查询用户角色
|
|
String roleCode = sysRoleService.getRoleCodeByUserId(userId);
|
|
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;
|
|
userId = null;
|
|
}
|
|
}
|
|
//查询项目信息以及广告主
|
|
//查询项目信息以及广告主
|
|
@@ -253,6 +256,9 @@ public class ProjectMemberController {
|
|
for (JSONObject object : list) {
|
|
for (JSONObject object : list) {
|
|
List<JSONObject> proList = new ArrayList<>();
|
|
List<JSONObject> proList = new ArrayList<>();
|
|
for (JSONObject have : projectList) {
|
|
for (JSONObject have : projectList) {
|
|
|
|
+ if(Check.isNull(have)){
|
|
|
|
+ continue;
|
|
|
|
+ }
|
|
if (Check.isNull(have.getLong("productId"))) {
|
|
if (Check.isNull(have.getLong("productId"))) {
|
|
continue;
|
|
continue;
|
|
}
|
|
}
|
|
@@ -302,7 +308,7 @@ public class ProjectMemberController {
|
|
//查询用户角色
|
|
//查询用户角色
|
|
String roleCode = sysRoleService.getRoleCodeByUserId(userId);
|
|
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;
|
|
userId = null;
|
|
}
|
|
}
|
|
//查询项目信息以及广告主
|
|
//查询项目信息以及广告主
|
|
@@ -397,7 +403,7 @@ public class ProjectMemberController {
|
|
try {
|
|
try {
|
|
|
|
|
|
String roleCode = sysRoleService.getRoleCodeByUserId(userId);
|
|
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();
|
|
List<Project> projects = projectService.list();
|
|
result.put("data", projects);
|
|
result.put("data", projects);
|
|
ResultMapUtils.setResultMap(result, StatusCode.COMMON_SUCCESS);
|
|
ResultMapUtils.setResultMap(result, StatusCode.COMMON_SUCCESS);
|
|
@@ -434,7 +440,7 @@ public class ProjectMemberController {
|
|
projectMember.setProductId(null);
|
|
projectMember.setProductId(null);
|
|
QueryWrapper<ProjectMember> queryWrapper = QueryGenerator.initQueryWrapper(projectMember, req.getParameterMap());
|
|
QueryWrapper<ProjectMember> queryWrapper = QueryGenerator.initQueryWrapper(projectMember, req.getParameterMap());
|
|
String roleCode = sysRoleService.getRoleCodeByUserId(userId);
|
|
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.eq("user_id", userId);
|
|
}
|
|
}
|
|
if (!Check.isNull(projectName)) {
|
|
if (!Check.isNull(projectName)) {
|
|
@@ -675,7 +681,7 @@ public class ProjectMemberController {
|
|
List<Integer> mediaIds = new ArrayList<>();
|
|
List<Integer> mediaIds = new ArrayList<>();
|
|
mediaIds.add(1);
|
|
mediaIds.add(1);
|
|
mediaIds.add(3);
|
|
mediaIds.add(3);
|
|
- List<ProjectMember> projectMemberList = projectMemberService.getProjects(mediaIds,userId);
|
|
|
|
|
|
+ List<ProjectMember> projectMemberList = projectMemberService.getProjects(mediaIds, userId);
|
|
if (projectMemberList == null) {
|
|
if (projectMemberList == null) {
|
|
result.error500("未找到对应实体");
|
|
result.error500("未找到对应实体");
|
|
} else {
|
|
} else {
|