huyc 项目档案代码提交

yifu-archives/yifu-archives-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/archives/service/impl/TEmployeeProjectServiceImpl.java

@@ -147,12 +147,20 @@ public class TEmployeeProjectServiceImpl extends ServiceImpl<TEmployeeProjectMap
 		TEmployeeInfo tEmployeeInfo = tEmployeeInfoMapper.selectOne(Wrappers.<TEmployeeInfo>query().lambda()
 				.eq(TEmployeeInfo::getEmpIdcard, tEmployeeProject.getEmpIdcard())
 				.eq(TEmployeeInfo::getDeleteFlag, CommonConstants.STATUS_NORMAL));
+
 		if (Common.isNotNull(tEmployeeInfo)) {
+
 			String empNO = getEmpNo(tEmployeeProject.getDeptNo());
 			tEmployeeProject.setEmpNo(empNO);
 			tEmployeeProject.setEmpId(tEmployeeInfo.getId());
 			tEmployeeProject.setProjectSource(CommonConstants.dingleDigitStrArray[5]);
 			this.save(tEmployeeProject);
+
+			if (CommonConstants.ZERO_STRING.equals(tEmployeeProject.getEmpNatrue())) {
+				tEmployeeInfo.setEmpNatrue(CommonConstants.ZERO_STRING);
+			}else if (CommonConstants.ONE_STRING.equals(tEmployeeProject.getEmpNatrue()) && !CommonConstants.ZERO_STRING.equals(tEmployeeInfo.getEmpNatrue())) {
+				tEmployeeInfo.setEmpNatrue(CommonConstants.ONE_STRING);
+			}
 			tEmployeeInfo.setProjectNum(tEmployeeInfo.getProjectNum().intValue() + CommonConstants.ONE_INT);
 			tEmployeeInfoMapper.updateById(tEmployeeInfo);
 			return R.ok();
@@ -754,6 +762,11 @@ public class TEmployeeProjectServiceImpl extends ServiceImpl<TEmployeeProjectMap
 		if (num == CommonConstants.ONE_INT) {
 			tEmployeeInfo.setProjectNum(tEmployeeInfo.getProjectNum().intValue() + CommonConstants.ONE_INT);
 		}
+		if (CommonConstants.ZERO_STRING.equals(tEmployeeInfo.getEmpNatrue())) {
+			tEmployeeInfo.setEmpNatrue(CommonConstants.ZERO_STRING);
+		}else if (CommonConstants.ONE_STRING.equals(tEmployeeInfo.getEmpNatrue()) && !CommonConstants.ZERO_STRING.equals(tEmployeeInfo.getEmpNatrue())) {
+			tEmployeeInfo.setEmpNatrue(CommonConstants.ONE_STRING);
+		}
 		updateList.add(tEmployeeInfo);
 		// 记录变更日志
 		TEmployeeInfo tEmployeeInfoOld = tEmployeeInfoMapper.selectById(tEmployeeInfo.getId());