Merge branch 'test' into main

姜超
2 parents d5d562cf bf843228
Showing 1 changed file with 1 additions and 1 deletions
fw-morax-service/src/main/java/cn/fw/morax/service/biz/salary/SalaryPoolBizService.java
@@ -248,7 +248,7 @@ public class SalaryPoolBizService {
             }
             queryVO.setOrderString(sb.toString());
         }
-        if (PublicUtil.isNotEmpty(queryVO.getQueryStaffs())) {
+        if (PublicUtil.isEmpty(queryVO.getQueryStaffs()) && PublicUtil.isNotEmpty(queryVO.getQueryStaffs())) {
             List<Long> queryStaffIds = Arrays.stream(queryVO.getQueryStaffs().split(",")).map(Long::parseLong).collect(Collectors.toList());
             queryVO.getManagerStaffList().retainAll(queryStaffIds);
         }