Browse Source

代码格式化

origin/dept_screen
yujt 5 years ago
parent
commit
71aa34a8c5
  1. 19
      epdc-cloud-api/src/main/java/com/elink/esua/epdc/service/impl/AdminServiceImpl.java

19
epdc-cloud-api/src/main/java/com/elink/esua/epdc/service/impl/AdminServiceImpl.java

@ -51,11 +51,11 @@ public class AdminServiceImpl implements AdminService {
public Result<EpdcWorkLogUserDetailDTO> getUserInfo() {
//缓存中用户信息
UserDetail user = SecurityUser.getUser();
if(user == null){
if (user == null) {
throw new RenException("用户未登录");
}
Result<String> customIdResult = analysisFeignClient.getCustomId();
if(customIdResult == null || StringUtils.isBlank(customIdResult.getData())){
if (customIdResult == null || StringUtils.isBlank(customIdResult.getData())) {
throw new RenException("无法获取到CustomID");
}
EpdcWorkLogUserDetailDTO epdcWorkLogUserDetailDTO = new EpdcWorkLogUserDetailDTO();
@ -67,7 +67,7 @@ public class AdminServiceImpl implements AdminService {
epdcWorkLogUserDetailDTO.setAgencyId(String.valueOf(user.getDeptId()));
epdcWorkLogUserDetailDTO.setAdminFlag(String.valueOf(user.getSuperAdmin()));
epdcWorkLogUserDetailDTO.setMobile(user.getMobile());
if(user.getSuperAdmin() == SuperAdminEnum.NO.value()){
if (user.getSuperAdmin() == SuperAdminEnum.NO.value()) {
//查询用户部门等信息
Result<ParentAndAllDeptDTO> dtoResult = adminFeignClient.getParentAndAllDept(user.getDeptId());
ParentAndAllDeptDTO deptDTO = dtoResult.getData();
@ -82,26 +82,27 @@ public class AdminServiceImpl implements AdminService {
public Result<EpdcAppWorkLogUserResult> getUserDeptOptionByUserId() {
//缓存中用户信息
UserDetail user = SecurityUser.getUser();
if(user == null){
if (user == null) {
throw new RenException("用户未登录");
}
EpdcAppWorkLogUserResult epdcAppWorkLogUserResult = new EpdcAppWorkLogUserResult();
epdcAppWorkLogUserResult.setDeptIds(user.getDeptIdList());
if(user.getSuperAdmin() == SuperAdminEnum.YES.value()){
if (user.getSuperAdmin() == SuperAdminEnum.YES.value()) {
Result<DeptOption> allDeptTree = adminFeignClient.getAllDeptTree();
if(allDeptTree==null || allDeptTree.getData() ==null){
return new Result<EpdcAppWorkLogUserResult>().error("获取部门列表失败");
if (allDeptTree == null || allDeptTree.getData() == null) {
return new Result<EpdcAppWorkLogUserResult>().error("获取部门列表失败");
}
epdcAppWorkLogUserResult.setDeptOption(allDeptTree.getData());
return new Result<EpdcAppWorkLogUserResult>().ok(epdcAppWorkLogUserResult);
}
Result<DeptOption> userDeptOptionByUserId = adminFeignClient.getUserDeptOptionByUserId();
if(userDeptOptionByUserId==null || userDeptOptionByUserId.getData() ==null){
return new Result<EpdcAppWorkLogUserResult>().error("获取部门列表失败");
if (userDeptOptionByUserId == null || userDeptOptionByUserId.getData() == null) {
return new Result<EpdcAppWorkLogUserResult>().error("获取部门列表失败");
}
epdcAppWorkLogUserResult.setDeptOption(userDeptOptionByUserId.getData());
return new Result<EpdcAppWorkLogUserResult>().ok(epdcAppWorkLogUserResult);
}
@Override
public Result<String> getCustomId() {
return analysisFeignClient.getCustomId();

Loading…
Cancel
Save