修改获取用户时的返回

esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/service/impl/UserServiceImpl.java

@@ -92,6 +92,7 @@ public class UserServiceImpl extends BaseServiceImpl<UserDao, UserEntity> implem
     private AdminFeignClient adminFeignClient;
     @Autowired
     private PartyAuthenticationFailedDao partyAuthenticationFailedDao;
+
     @Override
     public PageData<UserDTO> page(Map<String, Object> params) {
         this.verifyParams(params);
@@ -425,8 +426,8 @@ public class UserServiceImpl extends BaseServiceImpl<UserDao, UserEntity> implem
 //        userGridRel.setAllDeptIds(formUserDto.getStreetId() + "," + formUserDto.getCommunityId() + "," + formUserDto.getGridId());
 //        userGridRel.setParentDeptNames(formUserDto.getStreet() + "-" + formUserDto.getCommunity());
 //        userGridRel.setParentDeptIds(formUserDto.getStreetId() + "," + formUserDto.getCommunityId());
-        Result<ParentAndAllDeptDTO> parentAndAllDeptDTOResult=adminFeignClient.getParentAndAllDept(userGridRel.getGrid());
+        Result<ParentAndAllDeptDTO> parentAndAllDeptDTOResult = adminFeignClient.getParentAndAllDept(userGridRel.getGrid());
-        if(!parentAndAllDeptDTOResult.success()){
+        if (!parentAndAllDeptDTOResult.success()) {
             return new Result<EpdcUserRegisterInfoResultDTO>().error(parentAndAllDeptDTOResult.getMsg());
         }
         userGridRel.setAllDeptNames(parentAndAllDeptDTOResult.getData().getAllDeptNames());
@@ -742,14 +743,14 @@ public class UserServiceImpl extends BaseServiceImpl<UserDao, UserEntity> implem
         }
         if (null == userEntity) {
             wrapper.eq(UserFieldConsant.WX_UNION_ID, formDTO.getUnionId())
-                .eq(StringUtils.isNotBlank(formDTO.getOpenId()), UserFieldConsant.WX_OPEN_ID, formDTO.getOpenId())
+                    .eq(StringUtils.isNotBlank(formDTO.getOpenId()), UserFieldConsant.WX_OPEN_ID, formDTO.getOpenId())
-                .orderByDesc(FieldConstant.CREATED_TIME);
+                    .orderByDesc(FieldConstant.CREATED_TIME);
             userEntity = this.baseDao.selectOne(wrapper);
         }
         if (null != userEntity) {
             QueryWrapper<UserGridRelationEntity> ugWrapper = new QueryWrapper<>();
             ugWrapper.eq(UserFieldConsant.USER_ID, userEntity.getId())
-                .orderByDesc(UserFieldConsant.SWITCHED_TIME);
+                    .orderByDesc(UserFieldConsant.SWITCHED_TIME);
             List<UserGridRelationDTO> gridRelations = userGridRelationService.listUserGrid(userEntity.getId());
             if (CollUtil.isNotEmpty(gridRelations)) {
                 UserDTO dto = ConvertUtils.sourceToTarget(userEntity, UserDTO.class);
@@ -757,10 +758,8 @@ public class UserServiceImpl extends BaseServiceImpl<UserDao, UserEntity> implem
                 dto.setGrid(gridRelations.get(NumConstant.ZERO).getGrid());
                 return new Result<UserDTO>().ok(dto);
             }
-        } else {
-            return new Result<UserDTO>().error("没有找到用户信息");
         }
-        return new Result<>();
+        return new Result();
     }
 
 }