ZQ/laws-sinotruk-server
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix(标准化活动): 79935

Browse Source
This commit is contained in:
yjz
2024-01-05 16:42:11 +08:00
parent 99c4b3128b
commit 922e20756d
1 changed files with 7 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files
laws-modules/src/main/java/com/jero/modules/laws/standardization/service/impl/LawsStandardizationServiceImpl.java
+7 -15
View File
@@ -7,6 +7,7 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.jero.common.exception.JeroBootException; import com.jero.common.exception.JeroBootException;
import com.jero.common.system.vo.LoginUser; import com.jero.common.system.vo.LoginUser;
import com.jero.common.util.PasswordUtil;
import com.jero.common.util.SnowflakeUtils; import com.jero.common.util.SnowflakeUtils;
import com.jero.modules.laws.dataCenter.entity.LawsDataCenterFile; import com.jero.modules.laws.dataCenter.entity.LawsDataCenterFile;
import com.jero.modules.laws.dataCenter.service.ILawsDataCenterFileService; import com.jero.modules.laws.dataCenter.service.ILawsDataCenterFileService;
@@ -421,24 +422,15 @@ public class LawsStandardizationServiceImpl extends ServiceImpl<LawsStandardizat
// 工号 // 工号
lawsStandardizationGroup.setJobNum(sysUser.getUsername()); lawsStandardizationGroup.setJobNum(sysUser.getUsername());
//部门 //部门
if (StringUtils.isBlank(lawsStandardizationGroup.getDepartment()) List<SysDepart> sysDeparts = sysDepartService.queryUserDeparts(sysUser.getId());
&& StringUtils.isNotBlank(sysUser.getDepartIds())){ if (CollectionUtils.isNotEmpty(sysDeparts)){
List<SysDepart> sysDeparts = sysDepartService.queryUserDeparts(sysUser.getId()); String departNames = sysDeparts.stream().map(SysDepart::getDepartName).collect(Collectors.joining(","));
if (CollectionUtils.isNotEmpty(sysDeparts)){ lawsStandardizationGroup.setDepartment(departNames);
String departNames = sysDeparts.stream().map(SysDepart::getDepartName).collect(Collectors.joining(","));
lawsStandardizationGroup.setDepartment(departNames);
}
} }
// 电话 // 电话
if (StringUtils.isBlank(lawsStandardizationGroup.getPhone()) lawsStandardizationGroup.setPhone(PasswordUtil.decrypt(sysUser.getPhone()));
&& StringUtils.isNotBlank(sysUser.getPhone())){
lawsStandardizationGroup.setPhone(sysUser.getPhone());
}
// 邮箱 // 邮箱
if (StringUtils.isBlank(lawsStandardizationGroup.getMailbox()) lawsStandardizationGroup.setMailbox(PasswordUtil.decrypt(sysUser.getEmail()));
&& StringUtils.isNotBlank(sysUser.getEmail())){
lawsStandardizationGroup.setMailbox(sysUser.getEmail());
}
} }
} }