Merge branch 'master' of http://124.70.43.205:3000/wangchangsheng/evaluation

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

@@ -445,25 +445,25 @@ public class OrganizationEvaluationInfoServiceImpl extends ServiceImpl<Organizat
 	public List<Map> getEvaluationIndicatorList(String organizationEvaluationId, String binSection, String binStage, HttpServletRequest request) {
 		//判断是否是（重点专项和管理事项）
 		List<Map> indicatorMap = new ArrayList<>();
-		if("ZDZX".equals(CacheContext.bseIdObject.get(binStage).getStageCode()) || "GLSX".equals(CacheContext.bseIdObject.get(binStage).getStageCode())){
-
-			OrganizationEvaluation organizationEvaluation = organizationEvaluationService.getById(organizationEvaluationId);
-			if(null == organizationEvaluation){
-				return null;
-			}
-			List<Indicator> indicatorList = indicatorService.listAll("","","",binSection,binStage,"","",organizationEvaluation.getCheckCycle());
-			if(null != indicatorList && indicatorList.size()>0){
-				for (Indicator i : indicatorList){
-					Map map = new HashMap();
-					map.put("id",i.getId());
-					map.put("indicator_name",i.getIndicatorName());
-					indicatorMap.add(map);
-				}
-			}
-
-		}else {
+//		if("ZDZX".equals(CacheContext.bseIdObject.get(binStage).getStageCode()) || "GLSX".equals(CacheContext.bseIdObject.get(binStage).getStageCode())){
+//
+//			OrganizationEvaluation organizationEvaluation = organizationEvaluationService.getById(organizationEvaluationId);
+//			if(null == organizationEvaluation){
+//				return null;
+//			}
+//			List<Indicator> indicatorList = indicatorService.listAll("","","",binSection,binStage,"","",organizationEvaluation.getCheckCycle());
+//			if(null != indicatorList && indicatorList.size()>0){
+//				for (Indicator i : indicatorList){
+//					Map map = new HashMap();
+//					map.put("id",i.getId());
+//					map.put("indicator_name",i.getIndicatorName());
+//					indicatorMap.add(map);
+//				}
+//			}
+//
+//		}else {
 			indicatorMap = baseMapper.selectEvaluationIndicatorList(organizationEvaluationId,binSection,binStage);
-		}
+//		}
 
 		return indicatorMap;
 	}