소스 검색

修改配置

yumeng 4 년 전
부모
커밋
23025e10a1
1개의 변경된 파일12개의 추가작업 그리고 16개의 파일을 삭제
  1. 12 16
      jeecg-boot-module-system/src/main/java/org/jeecg/modules/ctop/controller/ProjectController.java

+ 12 - 16
jeecg-boot-module-system/src/main/java/org/jeecg/modules/ctop/controller/ProjectController.java

@@ -240,33 +240,29 @@ public class ProjectController {
                                                 @RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize,
                                                 HttpServletRequest req) {
         Result<IPage<Project>> result = new Result<>();
-      /*  String advertiserName = project.getAdvertiserName();
-        project.setAdvertiserName(null);*/
+
         String projectName = project.getProjectName();
         project.setProjectName(null);
-     /*   String industryId = project.getIndustryId();
-        project.setIndustryId(null);*/
+
+        String userId = project.getUserId();
+        project.setUserId(null);
+
         QueryWrapper<Project> queryWrapper = QueryGenerator.initQueryWrapper(project, req.getParameterMap());
         Page<Project> page = new Page<>(pageNo, pageSize);
         LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
         String roleCode = sysRoleService.getRoleCodeByUserId(sysUser.getId());
-        if (!(CtopRoleCodeConstant.COMMON_ROLE_CODE_ADMIN.equals(roleCode) || roleCode.contains("sale") || "meidaManager".equals(roleCode))) {
-            queryWrapper.eq("user_id", sysUser.getId());
-            queryWrapper.orderByDesc("create_time");
-        }
-        /*if (null != industryId && !"".equals(industryId.trim())) {
-            SysCategory category = sysCategoryService.getById(industryId);
-            if (null != category) {
-                queryWrapper.likeRight("industry_code", category.getCode());
-            }
+        if ("operator".equals(roleCode) || "kuaishouOperationManager".equals(roleCode) || "touTiaoOperationManager".equals(roleCode)) {
+            queryWrapper.eq("responsible_id", userId);
+
+        } else if ("plane".equals(roleCode) || "plan".equals(roleCode) || "shot".equals(roleCode) || "clip".equals(roleCode) || "designTeamLeader".equals(roleCode) || "planeLeader".equals(roleCode)) {
+            queryWrapper.eq("design_responsible_id", userId);
         }
-        if (!Check.isNull(advertiserName)) {
-            queryWrapper.like("advertiser_name", advertiserName);
 
-        }*/
         if (!Check.isNull(projectName)) {
             queryWrapper.like("project_name", projectName);
         }
+        queryWrapper.orderByDesc("create_time");
+
         IPage<Project> pageList = projectService.page(page, queryWrapper);
         List<Project> records = pageList.getRecords();
         if (!Check.isNull(records)) {