|
@@ -110,18 +110,21 @@ public class MaterialInfoController {
|
|
if ("admin".equals(roleCode) || "operator".equals(roleCode) || "kuaishouOperationManager".equals(roleCode) || "operationAssistant".equals(roleCode) || "touTiaoOperationManager".equals(roleCode)) {
|
|
if ("admin".equals(roleCode) || "operator".equals(roleCode) || "kuaishouOperationManager".equals(roleCode) || "operationAssistant".equals(roleCode) || "touTiaoOperationManager".equals(roleCode)) {
|
|
materialInfo.setUserId(null);
|
|
materialInfo.setUserId(null);
|
|
queryWrapper = QueryGenerator.initQueryWrapper(materialInfo, req.getParameterMap());
|
|
queryWrapper = QueryGenerator.initQueryWrapper(materialInfo, req.getParameterMap());
|
|
- } else if ("designTeamLeader".equals(roleCode) || "planeLeader".equals(roleCode) || "plane".equals(roleCode) || "plan".equals(roleCode)) {
|
|
|
|
|
|
+ } else if ("designTeamLeader".equals(roleCode) || "planeLeader".equals(roleCode) || "plane".equals(roleCode) || "plan".equals(roleCode) || "shot".equals(roleCode)) {
|
|
String userId = materialInfo.getUserId();
|
|
String userId = materialInfo.getUserId();
|
|
materialInfo.setUserId(null);
|
|
materialInfo.setUserId(null);
|
|
queryWrapper = QueryGenerator.initQueryWrapper(materialInfo, req.getParameterMap());
|
|
queryWrapper = QueryGenerator.initQueryWrapper(materialInfo, req.getParameterMap());
|
|
- List<Long> projects = memberService.selectProjectsByUserId(userId);
|
|
|
|
- if (!Check.isNull(projects)) {
|
|
|
|
- queryWrapper.in("project_id", projects);
|
|
|
|
- } else {
|
|
|
|
- result.setSuccess(true);
|
|
|
|
- result.setResult(null);
|
|
|
|
- return result;
|
|
|
|
|
|
+ if (Check.isNull(materialInfo.getProjectId())) {
|
|
|
|
+ List<Long> projects = memberService.selectProjectsByUserId(userId);
|
|
|
|
+ if (!Check.isNull(projects)) {
|
|
|
|
+ queryWrapper.in("project_id", projects);
|
|
|
|
+ } else {
|
|
|
|
+ result.setSuccess(true);
|
|
|
|
+ result.setResult(null);
|
|
|
|
+ return result;
|
|
|
|
+ }
|
|
}
|
|
}
|
|
|
|
+
|
|
} else {
|
|
} else {
|
|
queryWrapper = QueryGenerator.initQueryWrapper(materialInfo, req.getParameterMap());
|
|
queryWrapper = QueryGenerator.initQueryWrapper(materialInfo, req.getParameterMap());
|
|
}
|
|
}
|