修改

amos-boot-system-ugp/amos-boot-module-ugp-biz/src/main/java/com/yeejoin/amos/boot/module/ugp/biz/service/impl/ProjectServiceImpl.java

@@ -406,29 +406,19 @@ public class ProjectServiceImpl extends BaseService<ProjectDto, Project, Project
         JSONObject object = new JSONObject();
         ArrayList<String> axisData = Lists.newArrayList();
         ArrayList<Integer> seriesData = Lists.newArrayList();
-        ReginParams ReginParams = orgService.getReginParams();
-        String companyType = ReginParams.getBusinessInfo().getCompanyType();
-        Long companyId = ReginParams.getBusinessInfo().getCompanySequenceNbr();
+        ReginParams reginParams = orgService.getReginParams();
+        String roleName = reginParams.getRole().getRoleName();
+        Long companyId = reginParams.getBusinessInfo().getCompanySequenceNbr();
         LambdaQueryWrapper<SuperviseRule> wrapper = new LambdaQueryWrapper<>( );
         LambdaQueryWrapper<Project> wrapper1 = new LambdaQueryWrapper<>();
-        if (OrgEnum.监察部门.getKey().equals(companyType)) {
-            wrapper.eq(!ValidationUtil.isEmpty(companyId), SuperviseRule::getSuperviseDeptId, companyId);
 
-        } else if (OrgEnum.监检机构.getKey().equals(companyType)) {
-            wrapper.eq(!ValidationUtil.isEmpty(companyId), SuperviseRule::getInspectionUnitId, companyId);
-        }
-        if (!ValidationUtil.isEmpty(wrapper)) {
-            List<SuperviseRule> superviseRulesList = superviseRuleMapper.selectList(wrapper);
-            for (SuperviseRule superviseRule : superviseRulesList) {
-                wrapper1.eq(!ValidationUtil.isEmpty(superviseRule.getAdminRegionCode()), Project::getInstallRegionCode, superviseRule.getAdminRegionCode().toString());
-                List<Project> projectList = projectMapper.selectList(wrapper1);
-                for (Project project : projectList) {
+                List<Project> list = projectResourceService.getProjectList();
+                for (Project project : list) {
                     ProjectProcessDto projectProcessDto = projectMapper.getProjectProcessDto(project.getSequenceNbr());
                     axisData.add(projectProcessDto.getProjectName());
                     seriesData.add(getProjectProcess(projectProcessDto));
                 }
-            }
-        }
+
         object.put("axisData",axisData);
         object.put("seriesData",seriesData);
         return object;