gonglilong
2024-11-11 e610dbf131729194519ae1ebb63f4c4d613c41a0
skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sg/service/impl/SgProgressReportServiceImpl.java
@@ -82,11 +82,12 @@
               List<String> users=sgProjectInfoMapper.getUserS(controlUnitS);
               resultUsers.addAll(users);
            }
//            if(s.getSelfUnit()!=null){
//               String selfUnit = s.getSelfUnit().toString();
//               List<String> selfUnitusers=sgProjectInfoMapper.getUserS(selfUnit);
//               resultUsers.addAll(selfUnitusers);
//            }
            if(s.getSelfUnit()!=null){
               String selfUnit = s.getSelfUnit();
               List<String> selfUnitS = Arrays.asList(selfUnit.split(","));
               List<String> selfUnitusers=sgProjectInfoMapper.getUserS(selfUnitS);
               resultUsers.addAll(selfUnitusers);
            }
            s.setUserIDs(resultUsers);
@@ -125,11 +126,12 @@
               List<String> users=sgProjectInfoMapper.getUserS(controlUnitS);
               resultUsers.addAll(users);
            }
//            if(s.getSelfUnit()!=null){
//               String selfUnit = s.getSelfUnit().toString();
//               List<String> selfUnitusers=sgProjectInfoMapper.getUserS(selfUnit);
//               resultUsers.addAll(selfUnitusers);
//            }
            if(s.getSelfUnit()!=null){
               String selfUnit = s.getSelfUnit();
               List<String> selfUnitS = Arrays.asList(selfUnit.split(","));
               List<String> selfUnitusers=sgProjectInfoMapper.getUserS(selfUnitS);
               resultUsers.addAll(selfUnitusers);
            }
            s.setUserIDs(resultUsers);
@@ -589,11 +591,12 @@
               List<String> users=sgProjectInfoMapper.getUserS(controlUnitS);
               resultUsers.addAll(users);
            }
//            if(s.getSelfUnit()!=null){
//               String selfUnit = s.getSelfUnit().toString();
//               List<String> selfUnitusers=sgProjectInfoMapper.getUserS(selfUnit);
//               resultUsers.addAll(selfUnitusers);
//            }
            if(s.getSelfUnit()!=null){
               String selfUnit = s.getSelfUnit();
               List<String> selfUnitS = Arrays.asList(selfUnit.split(","));
               List<String> selfUnitusers=sgProjectInfoMapper.getUserS(selfUnitS);
               resultUsers.addAll(selfUnitusers);
            }
            s.setUserIDs(resultUsers);
@@ -736,11 +739,12 @@
               List<String> users=sgProjectInfoMapper.getUserS(controlUnitS);
               resultUsers.addAll(users);
            }
//            if(s.getSelfUnit()!=null){
//               String selfUnit = s.getSelfUnit().toString();
//               List<String> selfUnitusers=sgProjectInfoMapper.getUserS(selfUnit);
//               resultUsers.addAll(selfUnitusers);
//            }
            if(s.getSelfUnit()!=null){
               String selfUnit = s.getSelfUnit();
               List<String> selfUnitS = Arrays.asList(selfUnit.split(","));
               List<String> selfUnitusers=sgProjectInfoMapper.getUserS(selfUnitS);
               resultUsers.addAll(selfUnitusers);
            }
            s.setUserIDs(resultUsers);
@@ -781,8 +785,9 @@
            searchDTO.setCountryUnit(longList);
         }
         if(roleId==1800818489547112450L){
         if(roleId.equals(1800818489547112450L)){
            searchDTO.setSelfUnit(longList);
         }
      }
   }