diff --git a/laws-modules/src/main/java/com/jero/modules/laws/standardization/service/impl/LawsStandardizationServiceImpl.java b/laws-modules/src/main/java/com/jero/modules/laws/standardization/service/impl/LawsStandardizationServiceImpl.java index c9b28536..a2b75802 100644 --- a/laws-modules/src/main/java/com/jero/modules/laws/standardization/service/impl/LawsStandardizationServiceImpl.java +++ b/laws-modules/src/main/java/com/jero/modules/laws/standardization/service/impl/LawsStandardizationServiceImpl.java @@ -18,6 +18,7 @@ import com.jero.modules.system.entity.SysUser; import com.jero.modules.system.service.ISysDepartService; import com.jero.modules.system.service.ISysUserService; import lombok.extern.slf4j.Slf4j; +import org.apache.commons.collections4.CollectionUtils; import org.apache.commons.lang3.StringUtils; import org.springframework.context.annotation.Lazy; import org.springframework.stereotype.Service; @@ -391,22 +392,7 @@ public class LawsStandardizationServiceImpl extends ServiceImpl() - .eq(SysUser::getId, lawsStandardizationGroup.getPersonnelId())); - lawsStandardizationGroup.setPersonnel(sysUser.getRealname()); - // 工号 - lawsStandardizationGroup.setJobNum(sysUser.getUsername()); - //部门 - List sysDeparts = sysDepartService.queryUserDeparts(sysUser.getId()); - String departNames = sysDeparts.stream().map(SysDepart::getDepartName).collect(Collectors.joining(",")); - lawsStandardizationGroup.setDepartment(departNames); - // 电话 - lawsStandardizationGroup.setPhone(sysUser.getPhone()); - // 邮箱 - lawsStandardizationGroup.setMailbox(sysUser.getEmail()); - } + setUserInfo(lawsStandardizationGroup); // 文件信息 List ossFileList = ossFileService.list( @@ -421,6 +407,36 @@ public class LawsStandardizationServiceImpl extends ServiceImpl() + .eq(SysUser::getId, lawsStandardizationGroup.getPersonnelId()), false); + lawsStandardizationGroup.setPersonnel(sysUser.getRealname()); + // 工号 + lawsStandardizationGroup.setJobNum(sysUser.getUsername()); + //部门 + if (StringUtils.isBlank(lawsStandardizationGroup.getDepartment()) + && StringUtils.isNotBlank(sysUser.getDepartIds())){ + List sysDeparts = sysDepartService.queryUserDeparts(sysUser.getId()); + if (CollectionUtils.isNotEmpty(sysDeparts)){ + String departNames = sysDeparts.stream().map(SysDepart::getDepartName).collect(Collectors.joining(",")); + lawsStandardizationGroup.setDepartment(departNames); + } + } + // 电话 + if (StringUtils.isBlank(lawsStandardizationGroup.getPhone()) + && StringUtils.isNotBlank(sysUser.getPhone())){ + lawsStandardizationGroup.setPhone(sysUser.getPhone()); + } + // 邮箱 + if (StringUtils.isBlank(lawsStandardizationGroup.getMailbox()) + && StringUtils.isNotBlank(sysUser.getEmail())){ + lawsStandardizationGroup.setMailbox(sysUser.getEmail()); + } + } + } + @Override public List queryPaymentByStandardizationId(String standardizationId) { List lawsStandardizationPaymentList = lawsStandardizationPaymentService.list(