diff --git a/web-adapter/src/main/java/com/zcloud/basic/info/facade/ZcloudUserFacadeImpl.java b/web-adapter/src/main/java/com/zcloud/basic/info/facade/ZcloudUserFacadeImpl.java index 4f2118f5..787c469c 100644 --- a/web-adapter/src/main/java/com/zcloud/basic/info/facade/ZcloudUserFacadeImpl.java +++ b/web-adapter/src/main/java/com/zcloud/basic/info/facade/ZcloudUserFacadeImpl.java @@ -57,4 +57,11 @@ public class ZcloudUserFacadeImpl implements ZcloudUserFacade { List zcloudUserCo = userCoConvertor.converCOsToDubboCOs(users); return MultiResponse.of(zcloudUserCo); } + + @Override + public MultiResponse listUserByUserName(Collection collection) { + List users = userServiceI.listUserByUserName(collection); + List zcloudUserCo = userCoConvertor.converCOsToDubboCOs(users); + return MultiResponse.of(zcloudUserCo); + } } diff --git a/web-app/src/main/java/com/zcloud/basic/info/command/query/UserQueryExe.java b/web-app/src/main/java/com/zcloud/basic/info/command/query/UserQueryExe.java index 0add4392..e8eabcd8 100644 --- a/web-app/src/main/java/com/zcloud/basic/info/command/query/UserQueryExe.java +++ b/web-app/src/main/java/com/zcloud/basic/info/command/query/UserQueryExe.java @@ -145,6 +145,18 @@ public class UserQueryExe { return userCOS; } + + public List listUserByUserName(Collection collection) { + QueryWrapper userDOQueryWrapper = new QueryWrapper<>(); + userDOQueryWrapper.in("username",collection); + userDOQueryWrapper.eq("employment_flag", 1); + userDOQueryWrapper.eq("delete_enum", "FALSE"); + userDOQueryWrapper.groupBy("username"); + List list = userRepository.list(userDOQueryWrapper); + List userCOS = userCoConvertor.converDOsToCOs(list); + return userCOS; + } + public List getUserList() { List list = userRepository.list(); List userCOS = userCoConvertor.converDOsToCOs(list); diff --git a/web-app/src/main/java/com/zcloud/basic/info/service/UserServiceImpl.java b/web-app/src/main/java/com/zcloud/basic/info/service/UserServiceImpl.java index ca825293..4cc33323 100644 --- a/web-app/src/main/java/com/zcloud/basic/info/service/UserServiceImpl.java +++ b/web-app/src/main/java/com/zcloud/basic/info/service/UserServiceImpl.java @@ -126,6 +126,11 @@ public class UserServiceImpl implements UserServiceI { } + @Override + public List listUserByUserName(Collection collection) { + return userQueryExe.listUserByUserName(collection); + } + @Override public List getUserList() { return userQueryExe.getUserList(); diff --git a/web-client/src/main/java/com/zcloud/basic/info/api/UserServiceI.java b/web-client/src/main/java/com/zcloud/basic/info/api/UserServiceI.java index c0624c6c..12e3c970 100644 --- a/web-client/src/main/java/com/zcloud/basic/info/api/UserServiceI.java +++ b/web-client/src/main/java/com/zcloud/basic/info/api/UserServiceI.java @@ -51,7 +51,7 @@ public interface UserServiceI { List listByUserIds(Collection collection); - List getUserList(); + List listUserByUserName(Collection collection); SingleResponse getInfoById(Long id); @@ -89,5 +89,7 @@ public interface UserServiceI { PageResponse pageByNopermission(UserPageQry qry); + List getUserList(); + }