diff --git a/src/main/java/com/zcloud/controller/system/UsersController.java b/src/main/java/com/zcloud/controller/system/UsersController.java index 288f9d4..30c25f7 100644 --- a/src/main/java/com/zcloud/controller/system/UsersController.java +++ b/src/main/java/com/zcloud/controller/system/UsersController.java @@ -3425,7 +3425,7 @@ public class UsersController extends BaseController { resultList.add(value.get(0)); }); - List collect = resultList.stream().filter(data -> StringUtils.equals(data.getString("APPLY_TYPE"), "4")).collect(Collectors.toList()); + List collect = resultList.stream().filter(data -> StringUtils.equals(data.getString("APPLY_TYPE"), "4") || StringUtils.equals(data.getString("APPLY_TYPE"), "3")).collect(Collectors.toList()); /*List dimissionList = userCorpService.getDimissionUser(); System.out.println("dimissionList = " + dimissionList);*/