wanjia9506
/
microservices
forked from Gitlink/microservices
0
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request 'fix(项目管理-离职逻辑): 撤销离职相关修改' (#1036) from otto/microservices:master into master

This commit is contained in:
otto 2026-01-19 17:27:49 +08:00
parent ab58222217 e9e3852364
commit 1aabdcf752
1 changed files with 1 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
microservices-modules/microservices-modules-pms/src/main/java/com/microservices/pms/product/service/impl/PmsProductRequirementServiceImpl.java
View File

@ -103,19 +103,12 @@ public class PmsProductRequirementServiceImpl implements IPmsProductRequirementS
private ProductUserReqDataVo toProductUserReqDataVo(PmsProductRequirement pmsProductRequirement) {
ProductUserReqDataVo productUserReqDataVo = pmsProductRequirement.toProductUserReqDataVo();
if(StringUtils.isNotEmpty(productUserReqDataVo.getSourceUser())){
SimpleSysUser sourceUser=pmsCommonService.getSimpleSysUserByUsername(productUserReqDataVo.getSourceUser());
productUserReqDataVo.setSourceUser(sourceUser.getNickName());
}
// 设置状态
productUserReqDataVo.setStatus(ProductReqStatus.getTypeByKey(pmsProductRequirement.getStatus()));
if (StringUtils.isNotEmpty(pmsProductRequirement.getReviewContent())
&& JSON.isValid(pmsProductRequirement.getReviewContent())) {
JSONObject reviewContentJson = JSONObject.parseObject(pmsProductRequirement.getReviewContent());
if(reviewContentJson.getString("reviewUser")!=null){
SimpleSysUser reviewUser=pmsCommonService.getSimpleSysUserByUsername(reviewContentJson.getString("reviewUser"));
productUserReqDataVo.setReviewUser(reviewUser.getNickName());
}
productUserReqDataVo.setReviewUser(reviewContentJson.getString("reviewUser"));
productUserReqDataVo.setReviewContent(reviewContentJson.getString("reviewContent"));
}
return productUserReqDataVo;