diff --git a/pom.xml b/pom.xml index 63e2270..a6cfa85 100644 --- a/pom.xml +++ b/pom.xml @@ -13,6 +13,7 @@ UTF-8 UTF-8 + 1.7.0-SNAPSHOT @@ -49,6 +50,11 @@ web-infrastructure ${project.version} + + com.jjb.saas + jjb-saas-system-client + ${jjb.saas.system.client.version} + 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 bf6bdaf..4f2118f 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 @@ -40,8 +40,7 @@ public class ZcloudUserFacadeImpl implements ZcloudUserFacade { @Override public SingleResponse getInfoByUserId(Long aLong) { UserCO user = userServiceI.getInfoByUserId(aLong); - ZcloudUserCo zcloudUserCo = new ZcloudUserCo(); - BeanUtils.copyProperties(user, zcloudUserCo); + ZcloudUserCo zcloudUserCo = userCoConvertor.converCOToDubboCO(user); return SingleResponse.of(zcloudUserCo); } diff --git a/web-adapter/src/main/java/com/zcloud/basic/info/web/UserController.java b/web-adapter/src/main/java/com/zcloud/basic/info/web/UserController.java index e77d93b..3e29f93 100644 --- a/web-adapter/src/main/java/com/zcloud/basic/info/web/UserController.java +++ b/web-adapter/src/main/java/com/zcloud/basic/info/web/UserController.java @@ -43,8 +43,7 @@ public class UserController { SSOUser ssoUser = AuthContext.getCurrentUser(); List userCOS = translateField.translateZcloudCommonInformation(Arrays.asList(cmd), UserCO.class); ZcloudDepartmentInfoCo zcloudDpetInfoById = translateField.getZcloudDpetInfoById(1985993429287899137L); - ZcloudUserCo zcloudUserInfoById = translateField.getZcloudUserInfoById(1985906883444662274L); - + ZcloudUserCo zcloudUserInfoById = translateField.getZcloudUserInfoById(1985972624130953218L); return SingleResponse.of(cmd); } diff --git a/web-app/src/main/java/com/zcloud/basic/info/command/convertor/UserCoConvertor.java b/web-app/src/main/java/com/zcloud/basic/info/command/convertor/UserCoConvertor.java index 27daa1e..1ddca72 100644 --- a/web-app/src/main/java/com/zcloud/basic/info/command/convertor/UserCoConvertor.java +++ b/web-app/src/main/java/com/zcloud/basic/info/command/convertor/UserCoConvertor.java @@ -23,8 +23,10 @@ public interface UserCoConvertor { * @return */ List converDOsToCOs(List userDOs); + UserCO converDOToCO(UserDO userDO); FacadeUserAddCmd converEToFacadeUserAddCmd(UserE userE); List converCOsToDubboCOs(List userCOList); + ZcloudUserCo converCOToDubboCO(UserCO userCO); } 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 b5b3fca..941fbef 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 @@ -112,9 +112,7 @@ public class UserQueryExe { public UserCO getInfoByUserId(Long aLong) { UserDO byId = userRepository.getById(aLong); - UserCO userCO = new UserCO(); - BeanUtils.copyProperties(byId,userCO); - return userCO; + return userCoConvertor.converDOToCO(byId); } }