功能完善

ims-service/ims-eval/src/main/java/com/ims/eval/service/impl/OrganizationEvaluationRuleServiceImpl.java

@@ -467,28 +467,28 @@ public class OrganizationEvaluationRuleServiceImpl extends ServiceImpl<Organizat
 							organizationEvaluationRule.setOrganizationId(organizationStructure.getId());
 							organizationEvaluationRule.setOrganizationShortName(organizationStructure.getShortName());
 							organizationEvaluationRule.setBusinessType(organizationStructure.getBusinessType());
+							organizationEvaluationRule.setOrganizationType("DWKP");
+							organizationEvaluationRule.setEvaluationCycle(toFullSpell(str[2]));
+							organizationEvaluationRule.setEvaluateRuleId(evaluateRuleIds.toString());
+							organizationEvaluationRule.setBinSection(binSections.toString());
+							organizationEvaluationRule.setBinStage(binStages.toString());
+							organizationEvaluationRule.setDelFlag(false);
+							if ("是".equals(str[4])) {
+								organizationEvaluationRule.setIsCheck(true);
+							} else if ("否".equals(str[4])) {
+								organizationEvaluationRule.setIsCheck(false);
+							}
+							organizationEvaluationRule.setScjyWeight(Double.parseDouble(str[6]));
+							organizationEvaluationRule.setQqWeight(Double.parseDouble(str[7]));
+							organizationEvaluationRule.setJjWeight(Double.parseDouble(str[8]));
+							organizationEvaluationRule.setYear(str[5]);
+							organizationEvaluationRuleListSa.add(organizationEvaluationRule);
 						}
-						organizationEvaluationRule.setOrganizationType("DWKP");
-						organizationEvaluationRule.setEvaluationCycle(toFullSpell(str[2]));
-						organizationEvaluationRule.setEvaluateRuleId(evaluateRuleIds.toString());
-						organizationEvaluationRule.setBinSection(binSections.toString());
-						organizationEvaluationRule.setBinStage(binStages.toString());
-						organizationEvaluationRule.setDelFlag(false);
-						if ("是".equals(str[4])) {
-							organizationEvaluationRule.setIsCheck(true);
-						} else if ("否".equals(str[4])) {
-							organizationEvaluationRule.setIsCheck(false);
-						}
-						organizationEvaluationRule.setScjyWeight(Double.parseDouble(str[6]));
-						organizationEvaluationRule.setQqWeight(Double.parseDouble(str[7]));
-						organizationEvaluationRule.setJjWeight(Double.parseDouble(str[8]));
-						organizationEvaluationRule.setYear(str[5]);
-						organizationEvaluationRuleListSa.add(organizationEvaluationRule);
 					}
 				}
 				boolean a = super.updateBatchById(organizationEvaluationRuleListUp);
 				boolean b = super.saveBatch(organizationEvaluationRuleListSa);
-				if (a && b) {
+				if (a || b) {
 					return R.ok().data(b);
 				} else {
 					return R.error("导入失败！");