huangrh
/
youfool-devops-gd-jdk21
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

调整来源的用户查询判断

This commit is contained in:
黎润豪 2024-11-07 17:22:06 +08:00
parent 45d8d0679e
commit fbcd766e36
1 changed files with 4 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
src/main/java/com/chinaweal/youfool/devops/repair/service/impl/RepairServiceImpl.java
View File

@ -11,7 +11,6 @@ import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.chinaweal.youfool.devops.base.entity.Dict; import com.chinaweal.youfool.devops.base.entity.Dict;
import com.chinaweal.youfool.devops.base.service.IDictService; import com.chinaweal.youfool.devops.base.service.IDictService;
import com.chinaweal.youfool.devops.org.business.entity.BusinessUser;
import com.chinaweal.youfool.devops.org.business.service.BusinessUserService; import com.chinaweal.youfool.devops.org.business.service.BusinessUserService;
import com.chinaweal.youfool.devops.repair.controller.query.RepairTodoListQuery; import com.chinaweal.youfool.devops.repair.controller.query.RepairTodoListQuery;
import com.chinaweal.youfool.devops.repair.entity.*; import com.chinaweal.youfool.devops.repair.entity.*;
@ -21,7 +20,6 @@ import com.chinaweal.youfool.devops.repair.mapper.RepairMapper;
import com.chinaweal.youfool.devops.repair.mapper.RepairTodoMapper; import com.chinaweal.youfool.devops.repair.mapper.RepairTodoMapper;
import com.chinaweal.youfool.devops.repair.service.*; import com.chinaweal.youfool.devops.repair.service.*;
import com.chinaweal.youfool.framework.springboot.rest.RestResult; import com.chinaweal.youfool.framework.springboot.rest.RestResult;
import com.chinaweal.youfool.framework.springboot.rest.ResultCode;
import lombok.extern.slf4j.Slf4j; import lombok.extern.slf4j.Slf4j;
import org.apache.commons.lang3.StringUtils; import org.apache.commons.lang3.StringUtils;
import org.apache.logging.log4j.util.Strings; import org.apache.logging.log4j.util.Strings;
@ -78,34 +76,10 @@ public class RepairServiceImpl extends ServiceImpl<RepairMapper, Repair> impleme
} }
//判断来源 //判断来源
if (StringUtils.equals(repair.getSource(), "1")) { Dict source = iDictService.getByTypeAndCode("source", repair.getSource());
//内网发起，查询业务系统的用户信息 if (source != null) {
BusinessUser user; repair.setOrg(source.getName());
if (StringUtils.isNotBlank(repair.getUserId())) { repair.setOrgId(source.getName());
user = businessUserService.getById(repair.getUserId());
} else {
user = businessUserService.getByUsername(repair.getUsername());
}
if (user == null) {
return RestResult.error(ResultCode.USCID_INVALID, "找不到申报账号信息");
}
repair.setUserId(user.getUserId());
repair.setUsername(user.getUsername());
repair.setDeptId(user.getUnitId());
repair.setDept(user.getUnitName());
repair.setOrgId(user.getOrgId());
repair.setOrg(user.getOrgName());
repair.setNickname(user.getNickname());
if (StringUtils.isBlank(repair.getPhone())) {
repair.setPhone(user.getMobile());
}
repair.setSource("1");//内网
} else {
Dict source = iDictService.getByTypeAndCode("source", repair.getSource());
if (source != null) {
repair.setOrg(source.getName());
repair.setOrgId(source.getName());
}
} }
String oldRepairUUID = repair.getRepairId(); String oldRepairUUID = repair.getRepairId();