全部加上单位对应的人员

gonglilong

2024-09-14 6d8c0503a6664abbc8b416705ec4d9705a62fc9d

全部加上单位对应的人员

 skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sg/service/impl/SgProgressReportServiceImpl.java

@@ -498,11 +498,45 @@
    @Override
    public List<SgProgressReportVO> queryList(ProjectSearchDTO searchDTO) {
        BladeUser user = AuthUtil.getUser();
        //Long userId = user.getUserId();
        searchDTO.setUserUnit(Long.parseLong(user.getDeptId()));
        if(!user.getRoleId().equals("1811657352658042882")){

            searchDTO.setUserUnit(Long.parseLong(user.getDeptId()));
        }
        searchDTO.setRoleUnit(Long.parseLong(user.getRoleId()));
        //searchDTO.setUserId(userId);
        List<SgProgressReportVO> list = sgProgressReportMapper.queryList(searchDTO);
        if(list != null){
            list.forEach(s ->{
                List<String> resultUsers=new ArrayList<>();
                if(s.getControlUnit()!=null){
                    String controlUnit = s.getControlUnit();
                    List<String> users=sgProjectInfoMapper.getUserS(controlUnit);
                    resultUsers.addAll(users);
                }
//                if(s.getSelfUnit()!=null){
//                    String selfUnit = s.getSelfUnit().toString();
//                    List<String> selfUnitusers=sgProjectInfoMapper.getUserS(selfUnit);
//                    resultUsers.addAll(selfUnitusers);
//                }


                s.setUserIDs(resultUsers);
                String gxStepName = s.getGxStepName();
                String countyCd = s.getCountyCd();

                if("测量定位".equals(gxStepName)){

                    if(countyCd!=null){
                        List<String> xbUnitIDs=sgProjectInfoMapper.getUserS(countyCd);
                        s.setXbUnitIDs(xbUnitIDs);
                    }

                }


            });

        }
        return list;
    }

@@ -599,6 +633,38 @@
//            searchDTO.setAuditPerson(String.valueOf(userId));
//        }
        List<SgProgressReportVO> list = sgProgressReportMapper.queryList(page, searchDTO);
        if(list != null){
            list.forEach(s ->{
                List<String> resultUsers=new ArrayList<>();
                if(s.getControlUnit()!=null){
                    String controlUnit = s.getControlUnit();
                    List<String> users=sgProjectInfoMapper.getUserS(controlUnit);
                    resultUsers.addAll(users);
                }
//                if(s.getSelfUnit()!=null){
//                    String selfUnit = s.getSelfUnit().toString();
//                    List<String> selfUnitusers=sgProjectInfoMapper.getUserS(selfUnit);
//                    resultUsers.addAll(selfUnitusers);
//                }


                s.setUserIDs(resultUsers);
                String gxStepName = s.getGxStepName();
                String countyCd = s.getCountyCd();

                if("测量定位".equals(gxStepName)){

                    if(countyCd!=null){
                        List<String> xbUnitIDs=sgProjectInfoMapper.getUserS(countyCd);
                        s.setXbUnitIDs(xbUnitIDs);
                    }

                }


            });

        }
        return page.setRecords(list);
    }