|
|
|
@ -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()); |
|
|
|
if(!parentAndAllDeptDTOResult.success()){ |
|
|
|
Result<ParentAndAllDeptDTO> parentAndAllDeptDTOResult = adminFeignClient.getParentAndAllDept(userGridRel.getGrid()); |
|
|
|
if (!parentAndAllDeptDTOResult.success()) { |
|
|
|
return new Result<EpdcUserRegisterInfoResultDTO>().error(parentAndAllDeptDTOResult.getMsg()); |
|
|
|
} |
|
|
|
userGridRel.setAllDeptNames(parentAndAllDeptDTOResult.getData().getAllDeptNames()); |
|
|
|
@ -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(); |
|
|
|
} |
|
|
|
|
|
|
|
} |
|
|
|
|