法大大代码提交

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

@@ -496,8 +496,18 @@ public class TEmployeeProjectServiceImpl extends ServiceImpl<TEmployeeProjectMap
 					.eq(TEmployeeProject::getDeleteFlag, CommonConstants.STATUS_NORMAL)
 					.eq(TEmployeeProject::getProjectStatus, CommonConstants.ZERO_INT));
 
-			String errorMessage = excel.getEmpName()!=null?excel.getEmpName():" " + ";" + excel.getEmpIdcard() + ";" + excel.getDeptNo() + ";"
-					+ excel.getLeaveReason() + ";" + excel.getLeaveRemark()!=null?excel.getLeaveRemark():" " + ";";
+			String errorMessage = "";
+			if (Common.isNotNull(excel.getEmpName())) {
+				errorMessage = errorMessage.concat(excel.getEmpName()).concat(";");
+			}else {
+				errorMessage = " ".concat(";");
+			}
+			errorMessage = errorMessage + excel.getEmpIdcard() + ";" + excel.getDeptNo() + ";" + excel.getLeaveReason() + ";";
+			if (Common.isNotNull(excel.getLeaveRemark())) {
+				errorMessage = errorMessage.concat(excel.getLeaveRemark()).concat(";");
+			}else {
+				errorMessage = errorMessage.concat(" ").concat(";");
+			}
 			if (Common.isNotNull(tEmployeeProject)) {
 				if (tEmployeeProject.getInsuranceStatus() != CommonConstants.dingleDigitIntArray[0] || tEmployeeProject.getSocialStatus() != CommonConstants.dingleDigitIntArray[0] ||
 						tEmployeeProject.getFundStatus() != CommonConstants.dingleDigitIntArray[0]) {

yifu-archives/yifu-archives-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/archives/utils/DoJointTask.java

@@ -55,10 +55,10 @@ public class DoJointTask {
 						.eq(TEmployeeProject::getProjectStatus, CommonConstants.ZERO_INT));
 				if (Common.isNotNull(list)) {
 					Set<String> empNatrue = list.stream().map(TEmployeeProject::getEmpNatrue).collect(Collectors.toSet());
-					if (empNatrue.stream().anyMatch(e -> e.equals(CommonConstants.ZERO_STRING))) {
-						tEmployeeInfo.setEmpNatrue(CommonConstants.ZERO_STRING);
-					} else if (empNatrue.stream().anyMatch(e -> e.equals(CommonConstants.ONE_STRING))) {
+					if (empNatrue.stream().anyMatch(e -> e.equals(CommonConstants.ONE_STRING))) {
 						tEmployeeInfo.setEmpNatrue(CommonConstants.ONE_STRING);
+					} else if (empNatrue.stream().anyMatch(e -> e.equals(CommonConstants.ZERO_STRING))) {
+						tEmployeeInfo.setEmpNatrue(CommonConstants.ZERO_STRING);
 					} else {
 						tEmployeeInfo.setEmpNatrue(CommonConstants.TWO_STRING);
 					}