diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/transferData/service/TransferDataService.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/transferData/service/TransferDataService.java index ff099144..578456c1 100644 --- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/transferData/service/TransferDataService.java +++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/transferData/service/TransferDataService.java @@ -13,6 +13,7 @@ import lombok.extern.slf4j.Slf4j; import org.apache.commons.lang3.SerializationUtils; import org.dromara.common.core.enums.UserType; import org.dromara.common.core.service.OssService; +import org.dromara.common.utils.IdCardEncryptorUtil; import org.dromara.contractor.domain.SubConstructionUser; import org.dromara.contractor.domain.SubConstructionUserFile; import org.dromara.contractor.service.ISubConstructionUserFileService; @@ -79,6 +80,8 @@ public class TransferDataService { private TransferDataMapper transferDataMapper; @Resource private ISysUserService userService; + @Resource + private IdCardEncryptorUtil idCardEncryptorUtil; // 两个候选基础URL @@ -561,12 +564,15 @@ public class TransferDataService { constructionUser.setSfzEnd(stringToLocalDate(user.getSfzEnd(), "yyyy-MM-dd")); constructionUser.setSfzSite(user.getSfzSite()); constructionUser.setSfzBirth(stringToLocalDate(user.getSfzBirth(), "yyyy-MM-dd")); + if(user.getSfzNumber()!=null){ + constructionUser.setSfzNumber(idCardEncryptorUtil.encrypt(user.getSfzNumber())); + } constructionUser.setNativePlace(user.getNativePlace()); constructionUser.setYhkNumber(user.getYhkNumber()); constructionUser.setYhkOpeningBank(user.getYhkOpeningBank()); constructionUser.setYhkCardholder(user.getYhkCardholder()); constructionUser.setTypeOfWork(user.getTypeOfWork()); - constructionUser.setWageMeasureUnit(user.getSalary().toString()); + constructionUser.setWageMeasureUnit("1"); constructionUser.setClock("0"); constructionUser.setEntryDate(stringToDate(user.getEntryDate(), "yyyy-MM-dd HH:mm:ss")); constructionUser.setLeaveDate(stringToDate(user.getLeaveDate(), "yyyy-MM-dd HH:mm:ss")); @@ -576,8 +582,12 @@ public class TransferDataService { constructionUser.setRemark("GoLand"); constructionUser.setGoId(user.getId()); constructionUser.setGoOpenid(user.getOpenid()); - constructionUser.setProjectId(projectIdAndTeamId(1, user.getProjectId().toString())); - constructionUser.setTeamId(projectIdAndTeamId(2, user.getTeamId().toString())); + if(user.getProjectId()!=null){ + constructionUser.setProjectId(projectIdAndTeamId(1, user.getProjectId().toString())); + } + if(user.getTeamId()!=null){ + constructionUser.setTeamId(projectIdAndTeamId(2, user.getTeamId().toString())); + } constructionUser.setCreateBy(1L); constructionUser.setUpdateBy(1L); @@ -585,6 +595,7 @@ public class TransferDataService { } public Long projectIdAndTeamId(Integer types, String id) { + Long val = 0L; // 假设val是long类型 switch (types) {