bug修改

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

@@ -245,7 +245,11 @@ public class OrganizationRatingServiceImpl extends ServiceImpl<OrganizationRatin
 		if (r1.getSuccess().equals(false) && r2.getSuccess().equals(false) && r3.getSuccess().equals(false)) {
 			return R.error("评级失败");
 		}
-		Map<String, OrganizationRating> map = orgRating.stream().collect(Collectors.toMap(OrganizationRating::getId, Function.identity()));
+		Map<String, OrganizationRating> map = orgRating.stream().collect(Collectors.toMap(
+			OrganizationRating::getId,
+			Function.identity(),
+			(existing, replacement) -> existing,
+			LinkedHashMap::new));
 		List<OrganizationRating> organizationRatings = baseMapper.selectBatchIds(map.keySet());
 		savePortal(organizationRatings);
 //		return organizationRatings;
@@ -534,20 +538,22 @@ public class OrganizationRatingServiceImpl extends ServiceImpl<OrganizationRatin
 		IPage<OrganizationRating> list = baseMapper.selectList(page, id, organizationYearRatingId, binSection, year, organizationShortName,
 			organizationId, safetyEnvProtection, veto, netProfit, compositeScore, annualTarget, bonusPoint, compositeScoreRaking, projectLevel);
 		if (list.getRecords().isEmpty()) {
-			IPage<OrganizationRating> ls = baseMapper.selectList(page, null, null, null, null, null,
-				null, null, null, null, null, null, null, null,
-				null);
-			if (!ls.getRecords().isEmpty()) {
-				if (organizationYearRatingId != null) {
-					Map<String, OrganizationRating> map = ls.getRecords().stream().filter(rec -> organizationYearRatingId.equals(rec.getOrganizationYearRatingId()))
-						.collect(Collectors.toMap(OrganizationRating::getId, Function.identity()));
-					if (!map.isEmpty()) {
-						int i = baseMapper.deleteBatchIds(map.keySet());
-						getOrgRatingInfo(organizationYearRatingId);
-						list = baseMapper.selectList(page, id, organizationYearRatingId, binSection, year, organizationShortName, organizationId,
-							safetyEnvProtection, veto, netProfit, compositeScore, annualTarget, bonusPoint, compositeScoreRaking, projectLevel);
-					}
-				}
+			int c = iOrganizationRatingService.count();
+					if (c > 0) {
+//			IPage<OrganizationRating> ls = baseMapper.selectList(page, null, null, null, null, null,
+//				null, null, null, null, null, null, null, null,
+//				null);
+//			if (!ls.getRecords().isEmpty()) {
+//				if (organizationYearRatingId != null) {
+//					Map<String, OrganizationRating> map = ls.getRecords().stream().filter(rec -> organizationYearRatingId.equals(rec.getOrganizationYearRatingId()))
+//						.collect(Collectors.toMap(OrganizationRating::getId, Function.identity()));
+//					if (!map.isEmpty()) {
+//						int i = baseMapper.deleteBatchIds(map.keySet());
+//						getOrgRatingInfo(organizationYearRatingId);
+//						list = baseMapper.selectList(page, id, organizationYearRatingId, binSection, year, organizationShortName, organizationId,
+//							safetyEnvProtection, veto, netProfit, compositeScore, annualTarget, bonusPoint, compositeScoreRaking, projectLevel);
+//					}
+//				}
 				return list;
 			}
 			getOrgRatingInfo(organizationYearRatingId);