Browse Source

修改获取用户时的返回

dev
yujintao 6 years ago
parent
commit
daf1920a5e
  1. 9
      esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/service/impl/UserServiceImpl.java

9
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; private AdminFeignClient adminFeignClient;
@Autowired @Autowired
private PartyAuthenticationFailedDao partyAuthenticationFailedDao; private PartyAuthenticationFailedDao partyAuthenticationFailedDao;
@Override @Override
public PageData<UserDTO> page(Map<String, Object> params) { public PageData<UserDTO> page(Map<String, Object> params) {
this.verifyParams(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.setAllDeptIds(formUserDto.getStreetId() + "," + formUserDto.getCommunityId() + "," + formUserDto.getGridId());
// userGridRel.setParentDeptNames(formUserDto.getStreet() + "-" + formUserDto.getCommunity()); // userGridRel.setParentDeptNames(formUserDto.getStreet() + "-" + formUserDto.getCommunity());
// userGridRel.setParentDeptIds(formUserDto.getStreetId() + "," + formUserDto.getCommunityId()); // 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()); return new Result<EpdcUserRegisterInfoResultDTO>().error(parentAndAllDeptDTOResult.getMsg());
} }
userGridRel.setAllDeptNames(parentAndAllDeptDTOResult.getData().getAllDeptNames()); userGridRel.setAllDeptNames(parentAndAllDeptDTOResult.getData().getAllDeptNames());
@ -757,10 +758,8 @@ public class UserServiceImpl extends BaseServiceImpl<UserDao, UserEntity> implem
dto.setGrid(gridRelations.get(NumConstant.ZERO).getGrid()); dto.setGrid(gridRelations.get(NumConstant.ZERO).getGrid());
return new Result<UserDTO>().ok(dto); return new Result<UserDTO>().ok(dto);
} }
} else {
return new Result<UserDTO>().error("没有找到用户信息");
} }
return new Result<>(); return new Result();
} }
} }

Loading…
Cancel
Save