From e1f235008ea146a9ddd283682c762cec4dca94cb Mon Sep 17 00:00:00 2001
From: xiejun <xj@2023>
Date: 星期三, 13 九月 2023 15:28:07 +0800
Subject: [PATCH] 接口管理接口搜索支持模糊查询

---
 Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/IDockingSystemConfigService.java         |    6 ++-
 Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/UniversalInterfaceImpl.java         |    2 
 Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/DockingSystemConfigServiceImpl.java |    5 +-
 Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/DokingSysManaentServiceImpl.java    |   20 ++++++----
 Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/CodeDuckingSyncServiceImpl.java     |    1 
 Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/controller/DockingManagementController.java      |   54 ++++++++++++++++++--------
 Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/IDokingSysManaentService.java            |   14 ++++---
 7 files changed, 65 insertions(+), 37 deletions(-)

diff --git a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/controller/DockingManagementController.java b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/controller/DockingManagementController.java
index 93fa594..22eb94d 100644
--- a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/controller/DockingManagementController.java
+++ b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/controller/DockingManagementController.java
@@ -1,7 +1,9 @@
 package com.vci.ubcs.code.controller;
 
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport;
+import com.github.yulichang.wrapper.MPJLambdaWrapper;
 import com.vci.ubcs.code.dto.DockingSystemConfigDTO;
 import com.vci.ubcs.code.dto.DockingSystemDTO;
 import com.vci.ubcs.code.dto.DockingTaskDTO;
@@ -11,6 +13,7 @@
 import com.vci.ubcs.code.vo.pagemodel.*;
 import com.vci.ubcs.code.wrapper.*;
 import com.vci.ubcs.starter.exception.VciBaseException;
+import com.vci.ubcs.starter.util.UBCSSqlKeyword;
 import com.vci.ubcs.starter.web.pagemodel.BaseQueryObject;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
@@ -18,8 +21,10 @@
 import org.springblade.core.mp.support.Condition;
 import org.springblade.core.mp.support.Query;
 import org.springblade.core.tool.api.R;
+import org.springframework.util.CollectionUtils;
 import org.springframework.web.bind.annotation.*;
 
+import java.util.HashMap;
 import java.util.Map;
 
 /**
@@ -53,14 +58,17 @@
 	private final 	ICodeDuckingSyncService codeDuckingSyncService;
 
 	/**绯荤粺闆嗘垚鐨勭郴缁熶俊鎭垪琛�
-	 * @param dockingSystem 鍩虹鏌ヨ瀵硅薄锛屽寘鍚煡璇㈡潯浠讹紝鍒嗛〉锛屾帓搴忕瓑
+	 * @param condtionMap 鍩虹鏌ヨ瀵硅薄锛屽寘鍚煡璇㈡潯浠讹紝鍒嗛〉锛屾帓搴忕瓑
 	 *@return 绯荤粺闆嗘垚鐨勭郴缁熶俊鎭樉绀哄璞″垪琛�
 	 */
 	@GetMapping("/gridDockingSystem")
 	@ApiOperationSupport(order = 3)
-	@ApiOperation(value = "鍒嗛〉", notes = "dockingSystem")
-	public R<IPage<DockingSystemVO>> page(DockingSystem dockingSystem, Query query) {
-		IPage<DockingSystem> pages = dockingSystemService.page(Condition.getPage(query), Condition.getQueryWrapper(dockingSystem));
+	@ApiOperation(value = "鍒嗛〉", notes = "condtionMap")
+	public R<IPage<DockingSystemVO>> page(Map<String,String> condtionMap,Query query) {
+		if(!CollectionUtils.isEmpty(condtionMap)){}{
+			condtionMap=new HashMap<>();
+		}
+		IPage<DockingSystem> pages = dockingSystemService.page(Condition.getPage(query),UBCSSqlKeyword.buildConditionByMapString(condtionMap));
 		return R.data(DockingSystemWrapper.build().pageVO(pages));
 	}
 
@@ -104,14 +112,17 @@
 	}
 	/**
 	 * 绯荤粺闆嗘垚鍩虹淇℃伅鍒楄〃
-	 * @param dockingSystemConfig 鍩虹鏌ヨ瀵硅薄锛屽寘鍚煡璇㈡潯浠讹紝鍒嗛〉锛屾帓搴忕瓑
+	 * @param condtionMap 鍩虹鏌ヨ瀵硅薄锛屽寘鍚煡璇㈡潯浠讹紝鍒嗛〉锛屾帓搴忕瓑
 	 * @return 绯荤粺闆嗘垚鍩虹淇℃伅鏄剧ず瀵硅薄鍒楄〃
 	 */
 	@GetMapping("/gridSystemConfig")
 	@ApiOperationSupport(order = 3)
 	@ApiOperation(value = "鍒嗛〉", notes = "dockingSystemConfig")
-	public R<IPage<DockingSystemConfigVO>> gridSystemConfig(DockingSystemConfig dockingSystemConfig, Query query){
-		IPage<DockingSystemConfigVO>  pages=dockingSystemConfigService.page(dockingSystemConfig,query);
+	public R<IPage<DockingSystemConfigVO>> gridSystemConfig(Map<String,String> condtionMap, Query query){
+		if(!CollectionUtils.isEmpty(condtionMap)){
+			condtionMap=new HashMap<>();
+		}
+		IPage<DockingSystemConfigVO>  pages=dockingSystemConfigService.page(condtionMap,query);
 		return R.data(pages);
 	}
 
@@ -180,41 +191,50 @@
 
 	/**
 	 * 寰呴泦鎴愭暟鎹�
-	 * @param dockingData 鍩虹鏌ヨ瀵硅薄锛屽寘鍚煡璇㈡潯浠讹紝鍒嗛〉锛屾帓搴忕瓑
+	 * @param condtionMap 鍩虹鏌ヨ瀵硅薄锛屽寘鍚煡璇㈡潯浠讹紝鍒嗛〉锛屾帓搴忕瓑
 	 * @return 绯荤粺闆嗘垚鍩虹淇℃伅鏄剧ず瀵硅薄鍒楄〃
 	 */
 	@GetMapping("/gridDockingData")
 	@ApiOperationSupport(order = 3)
 	@ApiOperation(value = "鍒嗛〉", notes = "DockingDataVO")
-	public R<IPage<DockingDataVO>> gridDockingData(DockingData dockingData, Query query){
-		IPage<DockingDataVO> pages = dokingSysManaentService.gridDockingData(dockingData,query);
+	public R<IPage<DockingDataVO>> gridDockingData(Map<String,String>condtionMap, Query query){
+		if(!CollectionUtils.isEmpty(condtionMap)){
+			condtionMap=new HashMap<>();
+		}
+		IPage<DockingDataVO> pages = dokingSysManaentService.gridDockingData(condtionMap,query);
 		return R.data(pages);
 	}
 
 
 	/**
 	 * data鍒楄〃
-	 * @param dockingTask 鍩虹鏌ヨ瀵硅薄锛屽寘鍚煡璇㈡潯浠讹紝鍒嗛〉锛屾帓搴忕瓑
+	 * @param condtionMap 鍩虹鏌ヨ瀵硅薄锛屽寘鍚煡璇㈡潯浠讹紝鍒嗛〉锛屾帓搴忕瓑
 	 * @return 绯荤粺闆嗘垚鐨勭郴缁熶俊鎭樉绀哄璞″垪琛�
 	 */
 	@GetMapping("/gridDockingTask")
 	@ApiOperationSupport(order = 3)
-	@ApiOperation(value = "鍒嗛〉", notes = "DockingTaskVO")
-	public R<IPage<DockingTaskVO>> gridDockingTask(DockingTask dockingTask, Query query){
-		IPage<DockingTaskVO> pages = dokingSysManaentService.gridDockingTask(dockingTask,query);
+	@ApiOperation(value = "鍒嗛〉", notes = "condtionMap")
+	public R<IPage<DockingTaskVO>> gridDockingTask(Map<String,String> condtionMap, Query query){
+		if(!CollectionUtils.isEmpty(condtionMap)){
+			condtionMap=new HashMap<>();
+		}
+		IPage<DockingTaskVO> pages = dokingSysManaentService.gridDockingTask(condtionMap,query);
 		return R.data(pages);
 	}
 
 	/**
 	 * 鎺ㄩ�佹暟鎹泦鎴愭棩蹇楀垪琛�
-	 * @param dockingLog 鍩虹鏌ヨ瀵硅薄锛屽寘鍚煡璇㈡潯浠讹紝鍒嗛〉锛屾帓搴忕瓑
+	 * @param condtionMap 鍩虹鏌ヨ瀵硅薄锛屽寘鍚煡璇㈡潯浠讹紝鍒嗛〉锛屾帓搴忕瓑
 	 * @return 闆嗘垚鏃ュ織鏄剧ず瀵硅薄鍒楄〃
 	 */
 	@GetMapping("/gridLoge")
 	@ApiOperationSupport(order = 3)
 	@ApiOperation(value = "鍒嗛〉", notes = "DockingLogeVO")
-	public R<IPage<DockingLogeVO>> gridLoge(DockingLog dockingLog, Query query){
-		IPage<DockingLogeVO> pages = dokingSysManaentService.gridLoge(dockingLog,query);
+	public R<IPage<DockingLogeVO>> gridLoge(Map<String,String> condtionMap, Query query){
+		if(!CollectionUtils.isEmpty(condtionMap)){
+			condtionMap=new HashMap<>();
+		}
+		IPage<DockingLogeVO> pages = dokingSysManaentService.gridLoge(condtionMap,query);
 		return R.data(pages);
 	}
 
diff --git a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/IDockingSystemConfigService.java b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/IDockingSystemConfigService.java
index cb1190b..9f1c212 100644
--- a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/IDockingSystemConfigService.java
+++ b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/IDockingSystemConfigService.java
@@ -11,6 +11,8 @@
 import org.springblade.core.mp.support.Query;
 import org.springblade.core.tool.api.R;
 
+import java.util.Map;
+
 /***
  * 绯荤粺鎺ュ彛绠$悊-鎺ュ彛閰嶇疆鏈嶅姟
  * @author xiejun
@@ -21,10 +23,10 @@
 
 	/**
 	 * 绯荤粺闆嗘垚鍩虹淇℃伅鍒楄〃
-	 * @param dockingSystemConfig 鍩虹鏌ヨ瀵硅薄锛屽寘鍚煡璇㈡潯浠讹紝鍒嗛〉锛屾帓搴忕瓑
+	 * @param condtionMap 鍩虹鏌ヨ瀵硅薄锛屽寘鍚煡璇㈡潯浠讹紝鍒嗛〉锛屾帓搴忕瓑
 	 * @return 绯荤粺闆嗘垚鍩虹淇℃伅鏄剧ず瀵硅薄鍒楄〃
 	 */
-	IPage<DockingSystemConfigVO> page(DockingSystemConfig dockingSystemConfig, Query query);
+	IPage<DockingSystemConfigVO> page(Map<String,String> condtionMap, Query query);
 
 	/**
 	 * 澧炲姞 绯荤粺闆嗘垚鐨勬帴鍙g鐞嗕俊鎭�
diff --git a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/IDokingSysManaentService.java b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/IDokingSysManaentService.java
index aed6f9d..4441d42 100644
--- a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/IDokingSysManaentService.java
+++ b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/IDokingSysManaentService.java
@@ -5,31 +5,33 @@
 import com.vci.ubcs.code.vo.pagemodel.*;
 import org.springblade.core.mp.support.Query;
 
+import java.util.Map;
+
 /***
  * 绯荤当绠$悊鐩稿叧鏈嶅姟
  */
 public interface IDokingSysManaentService {
 	/**
 	 * data鍒楄〃
-	 * @param dockingTask 鍩虹鏌ヨ瀵硅薄锛屽寘鍚煡璇㈡潯浠讹紝鍒嗛〉锛屾帓搴忕瓑
+	 * @param condtionMap 鍩虹鏌ヨ瀵硅薄锛屽寘鍚煡璇㈡潯浠讹紝鍒嗛〉锛屾帓搴忕瓑
 	 * @return 绯荤粺闆嗘垚鐨勭郴缁熶俊鎭樉绀哄璞″垪琛�
 	 */
-	IPage<DockingTaskVO>gridDockingTask(DockingTask dockingTask, Query query);
+	IPage<DockingTaskVO>gridDockingTask(Map<String,String> condtionMap, Query query);
 	/**
 	 * 寰呴泦鎴愭暟鎹�
-	 * @param dockingData 鍩虹鏌ヨ瀵硅薄锛屽寘鍚煡璇㈡潯浠讹紝鍒嗛〉锛屾帓搴忕瓑
+	 * @param condtionMap 鍩虹鏌ヨ瀵硅薄锛屽寘鍚煡璇㈡潯浠讹紝鍒嗛〉锛屾帓搴忕瓑
 	 * @return 绯荤粺闆嗘垚鍩虹淇℃伅鏄剧ず瀵硅薄鍒楄〃
 	 */
-	IPage<DockingDataVO>gridDockingData(DockingData dockingData, Query query);
+	IPage<DockingDataVO>gridDockingData(Map<String,String> condtionMap, Query query);
 
 
 
 	/**
 	 * 鎺ㄩ�佹暟鎹泦鎴愭棩蹇楀垪琛�
-	 * @param dockingLog 鍩虹鏌ヨ瀵硅薄锛屽寘鍚煡璇㈡潯浠讹紝鍒嗛〉锛屾帓搴忕瓑
+	 * @param condtionMap 鍩虹鏌ヨ瀵硅薄锛屽寘鍚煡璇㈡潯浠讹紝鍒嗛〉锛屾帓搴忕瓑
 	 * @return 闆嗘垚鏃ュ織鏄剧ず瀵硅薄鍒楄〃
 	 */
-	IPage<DockingLogeVO>gridLoge(DockingLog dockingLog, Query query);
+	IPage<DockingLogeVO>gridLoge(Map<String,String> condtionMap, Query query);
 
 	/**
 	 * 鎺ュ彛param鍒楄〃
diff --git a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/CodeDuckingSyncServiceImpl.java b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/CodeDuckingSyncServiceImpl.java
index 775c622..5047545 100644
--- a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/CodeDuckingSyncServiceImpl.java
+++ b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/CodeDuckingSyncServiceImpl.java
@@ -156,7 +156,6 @@
 	 */
 	private void initPushDataTaks(int type){
 		initSysadmin();
-
 		List<DockingSystemConfig> dockingSystemConfigList = dockingSystemConfigService.list(
 			Wrappers.<DockingSystemConfig>query().lambda().eq(DockingSystemConfig::getUsedFlag,"true")
 				.eq(DockingSystemConfig::getPushType,type==2?"2":"1").eq(DockingSystemConfig::getDataFlowType, SysIntegrationDataFlowTypeEnum.PUSH.getValue()));//2鏄唬琛ㄥ垎绫绘帹閫侊紝1鏄唬琛ㄦ暟鎹帹閫�
diff --git a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/DockingSystemConfigServiceImpl.java b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/DockingSystemConfigServiceImpl.java
index 9c18cdd..7198dd1 100644
--- a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/DockingSystemConfigServiceImpl.java
+++ b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/DockingSystemConfigServiceImpl.java
@@ -35,6 +35,7 @@
 import com.vci.ubcs.starter.revision.service.RevisionModelUtil;
 import com.vci.ubcs.starter.util.DefaultAttrAssimtUtil;
 import com.vci.ubcs.starter.util.MdmBtmTypeConstant;
+import com.vci.ubcs.starter.util.UBCSSqlKeyword;
 import com.vci.ubcs.starter.web.constant.QueryOptionConstant;
 import com.vci.ubcs.starter.web.pagemodel.PageHelper;
 import com.vci.ubcs.starter.web.util.BeanUtilForVCI;
@@ -135,9 +136,9 @@
 	private IDockingLogeService dockingLogeService;
 
 	@Override
-	public IPage<DockingSystemConfigVO> page(DockingSystemConfig DockingSystemConfig, Query query) {
+	public IPage<DockingSystemConfigVO> page(Map<String,String>codtionMap, Query query) {
 
-		IPage<DockingSystemConfig> pages = page(Condition.getPage(query), Condition.getQueryWrapper(DockingSystemConfig));
+		IPage<DockingSystemConfig> pages = page(Condition.getPage(query), UBCSSqlKeyword.buildConditionByMapString(codtionMap));
 		List<DockingSystemConfig>  dockingSystemConfigList= pages.getRecords();
 		dockingSystemConfigList.stream().forEach(dockingSystemConfig -> {
 			dockingSystemConfig.setDataFlowTypeText(SysIntegrationDataFlowTypeEnum.getTextByValue(dockingSystemConfig.getDataFlowType()));
diff --git a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/DokingSysManaentServiceImpl.java b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/DokingSysManaentServiceImpl.java
index 646d483..4073285 100644
--- a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/DokingSysManaentServiceImpl.java
+++ b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/DokingSysManaentServiceImpl.java
@@ -7,12 +7,15 @@
 import com.vci.ubcs.code.service.*;
 import com.vci.ubcs.code.vo.pagemodel.*;
 import com.vci.ubcs.code.wrapper.*;
+import com.vci.ubcs.starter.util.UBCSCondition;
+import com.vci.ubcs.starter.util.UBCSSqlKeyword;
 import org.springblade.core.mp.support.Condition;
 import org.springblade.core.mp.support.Query;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
 import javax.annotation.Resource;
+import java.util.Map;
 
 @Service
 public class DokingSysManaentServiceImpl extends ServiceImpl<DockingSystemConfigMapper, DockingSystemConfig> implements IDokingSysManaentService {
@@ -55,29 +58,30 @@
 	private  IDockingDataService dockingDataService;
 	/**
 	 * data鍒楄〃
-	 * @param dockingTask 鍩虹鏌ヨ瀵硅薄锛屽寘鍚煡璇㈡潯浠讹紝鍒嗛〉锛屾帓搴忕瓑
+	 * @param condtionMap 鍩虹鏌ヨ瀵硅薄锛屽寘鍚煡璇㈡潯浠讹紝鍒嗛〉锛屾帓搴忕瓑
 	 * @return 绯荤粺闆嗘垚鐨勭郴缁熶俊鎭樉绀哄璞″垪琛�
 	 */
 	@Override
-	public IPage<DockingTaskVO> gridDockingTask(DockingTask dockingTask, Query query) {
-		IPage<DockingTask> pages=dockingTaskService.page(Condition.getPage(query), Condition.getQueryWrapper(dockingTask));
+	public IPage<DockingTaskVO> gridDockingTask(Map<String,String> condtionMap, Query query) {
+		IPage<DockingTask> pages=dockingTaskService.page(Condition.getPage(query),UBCSSqlKeyword.buildConditionByMapString(condtionMap));
 		return DockingTaskWrapper.build().pageVO(pages);
 	}
 
 	@Override
-	public IPage<DockingDataVO> gridDockingData(DockingData dockingData, Query query) {
-		IPage<DockingData> pages=dockingDataService.page(Condition.getPage(query), Condition.getQueryWrapper(dockingData));
+	public IPage<DockingDataVO> gridDockingData(Map<String,String> condtionMap, Query query) {
+		IPage<DockingData> pages=dockingDataService.page(Condition.getPage(query), UBCSSqlKeyword.buildConditionByMapString(condtionMap));
 		return DockingDataWrapper.build().pageVO(pages);
 	}
 
 	/**
 	 * 鎺ㄩ�佹暟鎹泦鎴愭棩蹇楀垪琛�
-	 * @param dockingLog 鍩虹鏌ヨ瀵硅薄锛屽寘鍚煡璇㈡潯浠讹紝鍒嗛〉锛屾帓搴忕瓑
+	 * @param condtionMap 鍩虹鏌ヨ瀵硅薄锛屽寘鍚煡璇㈡潯浠讹紝鍒嗛〉锛屾帓搴忕瓑
 	 * @return 闆嗘垚鏃ュ織鏄剧ず瀵硅薄鍒楄〃
 	 */
 	@Override
-	public IPage<DockingLogeVO> gridLoge(DockingLog dockingLog, Query query) {
-		IPage<DockingLog> pages=dockingLogeService.page(Condition.getPage(query), Condition.getQueryWrapper(dockingLog));
+	public IPage<DockingLogeVO> gridLoge(Map<String,String> condtionMap, Query query) {
+		//IPage<DockingLog> pages=dockingLogeService.page(Condition.getPage(query), Condition.getQueryWrapper(dockingLog));
+		IPage<DockingLog> pages=dockingLogeService.page(Condition.getPage(query), UBCSSqlKeyword.buildConditionByMapString(condtionMap));
 		return DockingLogeWrapper.build().pageVO(pages);
 	}
 
diff --git a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/UniversalInterfaceImpl.java b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/UniversalInterfaceImpl.java
index 8381d07..b835bb7 100644
--- a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/UniversalInterfaceImpl.java
+++ b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/UniversalInterfaceImpl.java
@@ -1781,10 +1781,10 @@
 									}
 									log.info(libId);
 								}else if(secType.equals("codelevelsec")) {//灞傜骇鐮佹
-									int level = codeBasicSecVO.getCodeLevelValue();
 									CodeClassifyVO levelCodeClassifyVO = new CodeClassifyVO();
 									CodeClassifyFullInfoBO classifyFullInfoBO = this.classifyService.getClassifyFullInfo(codeClassifyDO.getOid());
 									if(codeBasicSecVO.getCodeLevelType().equals("code_level_special")){//鎸囧畾灞傜骇
+										int level = codeBasicSecVO.getCodeLevelValue();
 										List<CodeClassifyVO> classifyVOS = classifyFullInfoBO.getParentClassifyVOs().stream().sorted(((o1, o2) -> o2.getDataLevel().compareTo(o1.getDataLevel()))).collect(Collectors.toList());
 										if (classifyVOS.size() >= level && level > 0) {
 											levelCodeClassifyVO = classifyVOS.get(level - 1);

--
Gitblit v1.9.3