From 28ca3d9f9e6e7eeeb7a7f2a7f50012350f3934c3 Mon Sep 17 00:00:00 2001
From: ludc
Date: 星期三, 13 十一月 2024 18:07:11 +0800
Subject: [PATCH] 优化业务数据的查询接口;修改业务数据保存和编辑接口没有保存基础默认属性问题。

---
 Source/plt-web/plt-web-parent/plt-web-api/src/main/java/com/vci/dto/BaseModelDTO.java                                                |    1 
 Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/service/UIDataServiceI.java                                          |   18 +-
 Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/service/impl/OsActionServiceImpl.java                                |    3 
 Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/service/impl/UIDataServiceImpl.java                                  |   54 ++++++----
 Source/plt-web/plt-web-parent/plt-web/src/main/resources/menuConfig.json                                                             |    9 +
 Source/plt-web/plt-web-parent/plt-web-api/src/main/java/com/vci/model/PRMItemDO.java                                                 |    4 
 Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/controller/WebPortalVIController.java                                |    1 
 Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/service/impl/OsBtmServiceImpl.java                                   |   21 ++++
 Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/frameworkcore/compatibility/impl/SmFunctionQueryServicePlatformImpl.java |    8 +
 Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/service/OsBtmServiceI.java                                           |   10 ++
 Source/plt-web/plt-web-parent/plt-web-api/src/main/java/com/vci/pagemodel/MenuVO.java                                                |    2 
 Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/controller/WebUIDataController.java                                  |   74 +++++++++++++-
 Source/plt-web/plt-web-parent/plt-web-api/src/main/java/com/vci/dto/DeleteDataDTO.java                                               |    1 
 Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/service/impl/OsPortalVIServiceImpl.java                              |   38 ++++--
 Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/PlatformWebApplication.java                                              |    2 
 15 files changed, 186 insertions(+), 60 deletions(-)

diff --git a/Source/plt-web/plt-web-parent/plt-web-api/src/main/java/com/vci/dto/BaseModelDTO.java b/Source/plt-web/plt-web-parent/plt-web-api/src/main/java/com/vci/dto/BaseModelDTO.java
index 24bdc02..a99584c 100644
--- a/Source/plt-web/plt-web-parent/plt-web-api/src/main/java/com/vci/dto/BaseModelDTO.java
+++ b/Source/plt-web/plt-web-parent/plt-web-api/src/main/java/com/vci/dto/BaseModelDTO.java
@@ -19,6 +19,7 @@
      * 鏁版嵁
      */
     private Map<String,String> data = new HashMap<>();
+
     /**
      * 瀛愯〃鐨勪笟鍔$被鍨�
      */
diff --git a/Source/plt-web/plt-web-parent/plt-web-api/src/main/java/com/vci/dto/DeleteDataDTO.java b/Source/plt-web/plt-web-parent/plt-web-api/src/main/java/com/vci/dto/DeleteDataDTO.java
index 2b6515f..c0a7b6e 100644
--- a/Source/plt-web/plt-web-parent/plt-web-api/src/main/java/com/vci/dto/DeleteDataDTO.java
+++ b/Source/plt-web/plt-web-parent/plt-web-api/src/main/java/com/vci/dto/DeleteDataDTO.java
@@ -18,6 +18,7 @@
      * 搴忓垪鍖�
      */
     private static final long serialVersionUID = -7983807253912311472L;
+
     /**
      * 鏍¢獙鏄惁琚紩鐢ㄧ殑寮�鍏�
      */
diff --git a/Source/plt-web/plt-web-parent/plt-web-api/src/main/java/com/vci/model/PRMItemDO.java b/Source/plt-web/plt-web-parent/plt-web-api/src/main/java/com/vci/model/PRMItemDO.java
index 24ffb05..b96d895 100644
--- a/Source/plt-web/plt-web-parent/plt-web-api/src/main/java/com/vci/model/PRMItemDO.java
+++ b/Source/plt-web/plt-web-parent/plt-web-api/src/main/java/com/vci/model/PRMItemDO.java
@@ -163,11 +163,11 @@
     /**
      * 鏌ヨ妯℃澘鍚嶇О
      */
-    private String itemQtName = "";
+    private String itemQtName = "0";
     /**
      * 鏄惁蹇呭~ 0:鍚︼紝1锛氭槸
      */
-    private String itemIsRequired = "";
+    private String itemIsRequired = "0";
     /**
      *http瀛樺偍寮�鍏�  0锛氬惁锛�1锛氭槸
      */
diff --git a/Source/plt-web/plt-web-parent/plt-web-api/src/main/java/com/vci/pagemodel/MenuVO.java b/Source/plt-web/plt-web-parent/plt-web-api/src/main/java/com/vci/pagemodel/MenuVO.java
index 4c2da4d..2bc25bf 100644
--- a/Source/plt-web/plt-web-parent/plt-web-api/src/main/java/com/vci/pagemodel/MenuVO.java
+++ b/Source/plt-web/plt-web-parent/plt-web-api/src/main/java/com/vci/pagemodel/MenuVO.java
@@ -81,7 +81,7 @@
 	private Integer sort;
 
 	/**
-	 * 鑿滃崟绫诲瀷
+	 * 鑿滃崟绫诲瀷: 0锛氳彍鍗曪紝1锛氭寜閽�
 	 */
 	private Integer category;
 
diff --git a/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/PlatformWebApplication.java b/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/PlatformWebApplication.java
index 6680265..612dd98 100644
--- a/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/PlatformWebApplication.java
+++ b/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/PlatformWebApplication.java
@@ -41,4 +41,4 @@
     public void preDestroy(){
         System.out.println("鍋滀簡骞冲彴web瀹㈡埛绔殑鏈嶅姟");
     }
-}
+}
\ No newline at end of file
diff --git a/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/frameworkcore/compatibility/impl/SmFunctionQueryServicePlatformImpl.java b/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/frameworkcore/compatibility/impl/SmFunctionQueryServicePlatformImpl.java
index f0db871..c053571 100644
--- a/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/frameworkcore/compatibility/impl/SmFunctionQueryServicePlatformImpl.java
+++ b/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/frameworkcore/compatibility/impl/SmFunctionQueryServicePlatformImpl.java
@@ -340,6 +340,7 @@
                                     menuVO.setModeType("FunctionObject");
                                     menuVO.setIsValid(info.isValid);
                                     menuVO.setHasChildren(false);
+                                    menuVO.setCategory(1);
                                     menuVOList.add(menuVO);
                                 }
                             }
@@ -357,6 +358,7 @@
                                     MenuVO menuVO = this.functionInfoToMenuVO(funcInfo);
                                     menuVO.setChildType(childType);
                                     menuVO.setModeType("FunctionObject");
+                                    menuVO.setCategory(0);
                                     menuVOList.add(menuVO);
                                 }
                             }
@@ -389,7 +391,9 @@
                         FunctionInfo funcInfo = funcInfos[i];
                         MenuVO menuVO = this.functionInfoToMenuVO(funcInfo);
                         menuVO.setModeType("FunctionObject");
+                        childType = this.checkChildObject(funcInfos[i].id);
                         menuVO.setChildType(childType);
+                        menuVO.setCategory(0);
                         menuVOList.add(menuVO);
                     }
                     return menuVOList;
@@ -416,7 +420,7 @@
                     menuVO.setName(operateInfo.name);
                     menuVO.setCode(operateInfo.identify);
                     menuVO.setAlias(operateInfo.alias);
-                    menuVO.setCategory(2);
+                    menuVO.setCategory(1);
                     menuVO.setChildType(0);
                     menuVO.setRemark(operateInfo.desc);
                     menuVO.getMeta().put("keepAlive",false);
@@ -471,7 +475,7 @@
     @Override
     public int checkChildObject(String moduleId) throws VciBaseException {
         long res = 0;
-        try{//20D63A69-C6BC-8519-8B2B-E5ACFEA62394
+        try{
             res = platformClientUtil.getFrameworkService().checkChildObject(moduleId);
         }catch (PLException e) {
             e.printStackTrace();
diff --git a/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/controller/WebPortalVIController.java b/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/controller/WebPortalVIController.java
index 3eafa45..aa8f0f9 100644
--- a/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/controller/WebPortalVIController.java
+++ b/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/controller/WebPortalVIController.java
@@ -93,7 +93,6 @@
         }else{
             return portalVIServiceI.addSave(portalVIDTO);
         }
-
     }
     /**
      * 琛ㄥ崟/table鍒犻櫎
diff --git a/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/controller/WebUIDataController.java b/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/controller/WebUIDataController.java
index b1a9072..c436ff7 100644
--- a/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/controller/WebUIDataController.java
+++ b/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/controller/WebUIDataController.java
@@ -7,13 +7,17 @@
 import com.vci.dto.FormLinkDataDTO;
 import com.vci.starter.web.annotation.controller.VciUnCheckRight;
 import com.vci.starter.web.annotation.log.VciBusinessLog;
+import com.vci.starter.web.exception.VciBaseException;
 import com.vci.starter.web.pagemodel.*;
 import com.vci.pagemodel.ReferConfigVO;
 import com.vci.pagemodel.UIFormDataVO;
+import com.vci.starter.web.util.VciBaseUtil;
 import com.vci.web.query.UIDataGridQuery;
 import com.vci.web.query.UIFormQuery;
 import com.vci.web.query.UITreeQuery;
 import com.vci.web.service.UIDataServiceI;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.util.CollectionUtils;
 import org.springframework.web.bind.annotation.*;
@@ -39,6 +43,11 @@
     private UIDataServiceI uiDataService;
 
     /**
+     * 鏃ュ織
+     */
+    private Logger logger = LoggerFactory.getLogger(getClass());
+
+    /**
      * 鍒楄〃鏌ヨ
      * @param dataGridQuery 鏌ヨ瀵硅薄
      * @return 鍒楄〃鏁版嵁
@@ -59,7 +68,14 @@
     @VciUnCheckRight
     @VciBusinessLog(operateName = "琛ㄥ崟鐨勬煡璇�",description = "${param.btmname}閲岀殑${param.formDefineId}")
     public BaseResult<UIFormDataVO> getDataForForm(UIFormQuery formQuery){
-        return BaseResult.success(uiDataService.getDataForForm(formQuery));
+        try {
+            return BaseResult.success(uiDataService.getDataForForm(formQuery));
+        }catch (Exception e){
+            e.printStackTrace();
+            String errorMsg = "琛ㄥ崟鏁版嵁鏌ヨ鏃跺嚭鐜伴敊璇紝鍘熷洜锛�"+ VciBaseUtil.getExceptionMessage(e);
+            logger.error(errorMsg);
+            throw new VciBaseException(errorMsg);
+        }
     }
 
     /**
@@ -83,7 +99,14 @@
     @VciUnCheckRight
     @VciBusinessLog(operateName = "娣诲姞鏁版嵁",description = "${param.btmname}")
     public BaseResult<Map<String,Object>> addSave(@RequestBody FormDataDTO formDataDTO){
-        return uiDataService.addSave(formDataDTO);
+        try {
+            return uiDataService.addSave(formDataDTO);
+        }catch (Exception e){
+            e.printStackTrace();
+            String errorMsg = "娣诲姞鏁版嵁鏃跺嚭鐜伴敊璇紝鍘熷洜锛�"+ VciBaseUtil.getExceptionMessage(e);
+            logger.error(errorMsg);
+            throw new VciBaseException(errorMsg);
+        }
     }
 
     /**
@@ -94,7 +117,14 @@
     @PostMapping("/linkAddSave")
     @VciBusinessLog(operateName = "娣诲姞閾炬帴鏁版嵁",description = "${param.linkType}")
     public BaseResult<String> linkAddSave(@RequestBody FormLinkDataDTO formLinkDataDTO){
-        return uiDataService.linkAddSave(formLinkDataDTO);
+        try {
+            return uiDataService.linkAddSave(formLinkDataDTO);
+        }catch (Exception e){
+            e.printStackTrace();
+            String errorMsg = "娣诲姞閾炬帴绫诲瀷鏁版嵁鏃跺嚭鐜伴敊璇紝鍘熷洜锛�"+ VciBaseUtil.getExceptionMessage(e);
+            logger.error(errorMsg);
+            throw new VciBaseException(errorMsg);
+        }
     }
 
     /**
@@ -106,7 +136,14 @@
     @VciUnCheckRight
     @VciBusinessLog(operateName = "淇敼鏁版嵁",description = "${param.btmname}閲岀殑${param.oid}")
     public BaseResult<Map<String,Object>> editSave(@RequestBody FormDataDTO formDataDTO){
-        return uiDataService.editSave(formDataDTO);
+        try {
+            return uiDataService.editSave(formDataDTO);
+        }catch (Exception e){
+            e.printStackTrace();
+            String errorMsg = "淇敼鏁版嵁鏃跺嚭鐜伴敊璇紝鍘熷洜锛�"+ VciBaseUtil.getExceptionMessage(e);
+            logger.error(errorMsg);
+            throw new VciBaseException(errorMsg);
+        }
     }
 
     /**
@@ -117,7 +154,14 @@
     @VciBusinessLog(operateName = "淇敼閾炬帴绫诲瀷鏁版嵁",description = "${param.linkType}閲岀殑${param.oid}")
     @PutMapping("/linkEditSave")
     public BaseResult linkEditSave(@RequestBody FormLinkDataDTO formLinkDataDTO){
-        return uiDataService.linkEditSave(formLinkDataDTO);
+        try {
+            return uiDataService.linkEditSave(formLinkDataDTO);
+        }catch (Exception e){
+            e.printStackTrace();
+            String errorMsg = "淇敼閾炬帴绫诲瀷鐨勬暟鎹椂鍑虹幇閿欒锛屽師鍥狅細"+ VciBaseUtil.getExceptionMessage(e);
+            logger.error(errorMsg);
+            throw new VciBaseException(errorMsg);
+        }
     }
 
     /**
@@ -156,10 +200,17 @@
      * @return 鎵ц鐨勭粨鏋�
      */
     @DeleteMapping("/deleteData")
-    @VciUnCheckRight
+    //@VciUnCheckRight
     @VciBusinessLog(operateName = "鍒犻櫎鏁版嵁",description = "${param.dataList.0.btmname}鐨�${param.dataList.${join}.oid}")
     public BaseResult deleteData(@RequestBody DeleteDataDTO deleteDataDTO){
-        return uiDataService.batchDelete(deleteDataDTO);
+        try {
+            return uiDataService.batchDelete(deleteDataDTO);
+        }catch (Exception e){
+            e.printStackTrace();
+            String errorMsg = "鍒犻櫎鏁版嵁鏃跺嚭鐜伴敊璇紝鍘熷洜锛�"+ VciBaseUtil.getExceptionMessage(e);
+            logger.error(errorMsg);
+            throw new VciBaseException(errorMsg);
+        }
     }
 
     /**
@@ -181,7 +232,14 @@
     @GetMapping("/defaultReferDataGrid")
     @VciBusinessLog(operateName = "鑾峰彇鍙傜収鐨勫垪琛ㄦ暟鎹�",description = "")
     public DataGrid defaultReferDataGrid(ReferConfigVO referConfigVO,PageHelper pageHelper){
-        return uiDataService.referDataGrid(referConfigVO,pageHelper);
+        try {
+            return uiDataService.referDataGrid(referConfigVO,pageHelper);
+        }catch (Exception e){
+            e.printStackTrace();
+            String errorMsg = "榛樿鐨勫弬鐓у垪琛ㄦ椂鍑虹幇閿欒锛屽師鍥狅細"+ VciBaseUtil.getExceptionMessage(e);
+            logger.error(errorMsg);
+            throw new VciBaseException(errorMsg);
+        }
     }
 
     /**
diff --git a/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/service/OsBtmServiceI.java b/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/service/OsBtmServiceI.java
index c489099..fe96380 100644
--- a/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/service/OsBtmServiceI.java
+++ b/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/service/OsBtmServiceI.java
@@ -103,11 +103,21 @@
     List<OsBtmTypeVO> listBtmByIds(Collection<String> btmIds);
 
     /**
+     * TODO:灏介噺鍒敤杩欎釜鏂规硶寰堟參锛屽仛浜嗕竴娆″叏鏌ュ啀杞潵杞幓
      * 浣跨敤缂栧彿鑾峰彇涓氬姟绫诲瀷
      * @param id 缂栧彿
      * @return 涓氬姟绫诲瀷
      */
     OsBtmTypeVO getBtmById(String id);
+
+    /**
+     * 浣跨敤绫诲瀷鍚嶈幏鍙栦笟鍔$被鍨�,鏌ヤ笉鍒扮洿鎺ユ姤閿�
+     * @param btmName 绫诲瀷鍚�
+     * @return 涓氬姟绫诲瀷
+     * @throws
+     */
+    OsBtmTypeVO getBtmByName(String btmName) throws PLException;
+
     /**
      * 浣跨敤缂栧彿鑾峰彇涓氬姟绫诲瀷
      * @param id 缂栧彿
diff --git a/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/service/UIDataServiceI.java b/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/service/UIDataServiceI.java
index 8213139..bd46053 100644
--- a/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/service/UIDataServiceI.java
+++ b/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/service/UIDataServiceI.java
@@ -42,7 +42,7 @@
      * @return 琛ㄥ崟鐨勬暟鎹�
      * @throws VciBaseException 鏌ヨ鍑洪敊鐨勬椂鍊欎細鎶涘嚭寮傚父
      */
-    UIFormDataVO getDataForForm(UIFormQuery formQuery) throws VciBaseException;
+    UIFormDataVO getDataForForm(UIFormQuery formQuery) throws VciBaseException, PLException;
 
     /**
      * 鑾峰彇鏍戝舰鏁版嵁
@@ -108,7 +108,7 @@
      * @return 鎵ц缁撴灉鍜屾樉绀哄悗鐨勫��
      * @throws VciBaseException 淇濆瓨鍑洪敊鐨勬椂鍊欎細鎶涘嚭寮傚父
      */
-    BaseResult<Map<String,Object>> addSave(FormDataDTO formDataDTO) throws VciBaseException;
+    BaseResult<Map<String,Object>> addSave(FormDataDTO formDataDTO) throws VciBaseException, PLException;
 
     /**
      * 涓氬姟绫诲瀷
@@ -160,7 +160,7 @@
      * @return 鎵ц缁撴灉鍜屼富閿�
      * @throws VciBaseException 淇濆瓨鍑洪敊鐨勬椂鍊欎細鎶涘嚭寮傚父
      */
-    BaseResult<String> batchAddSave(FormDataDTOList formDataDTOList) throws VciBaseException;
+    BaseResult<String> batchAddSave(FormDataDTOList formDataDTOList) throws VciBaseException, PLException;
 
     /**
      * 淇敼鏁版嵁銆傛敞鎰忚〃鍗曞畾涔夌殑瀛楁鎵嶄細琚慨鏀癸紝ts杩欑榛樿瀛楁闄ゅ
@@ -168,7 +168,7 @@
      * @return 鎵ц缁撴灉鍜屾樉绀哄悗鐨勫��
      * @throws VciBaseException 淇濆瓨鍑洪敊鐨勬椂鍊欎細鎶涘嚭寮傚父
      */
-    BaseResult<Map<String,Object>> editSave(FormDataDTO formDataDTO) throws VciBaseException;
+    BaseResult<Map<String,Object>> editSave(FormDataDTO formDataDTO) throws VciBaseException, PLException;
 
     /**
      * 鏁版嵁鍗囩増
@@ -184,7 +184,7 @@
      * @return 鎵ц缁撴灉鍜屾樉绀哄悗鐨勫��
      * @throws VciBaseException 淇濆瓨鍑洪敊鐨勬椂鍊欎細鎶涘嚭寮傚父
      */
-    BaseResult<String> batchEditSave(FormDataDTOList formDataDTOList) throws VciBaseException;
+    BaseResult<String> batchEditSave(FormDataDTOList formDataDTOList) throws VciBaseException, PLException;
 
     /**
      * 鎵归噺鍒犻櫎
@@ -192,7 +192,7 @@
      * @return 鎵ц缁撴灉
      * @throws VciBaseException 鏁版嵁琚紩鐢ㄧ殑鏃跺�欎細鎶涘嚭寮傚父
      */
-    BaseResult batchDelete(DeleteDataDTO deleteDataDTO)  throws VciBaseException;
+    BaseResult batchDelete(DeleteDataDTO deleteDataDTO) throws VciBaseException, PLException;
 
     /**
      * 閾炬帴绫诲瀷娣诲姞
@@ -200,7 +200,7 @@
      * @return 閾炬帴绫诲瀷鐨勪富閿�
      * @throws VciBaseException 鍙傛暟涓虹┖锛屽繀杈撻」缂哄け
      */
-    BaseResult<String> linkAddSave(FormLinkDataDTO formLinkDataDTO) throws VciBaseException;
+    BaseResult<String> linkAddSave(FormLinkDataDTO formLinkDataDTO) throws VciBaseException, PLException;
 
     /**
      * 璁剧疆鍊煎埌涓氬姟绫诲瀷鐨勫璞′笂
@@ -217,7 +217,7 @@
      * @return 鎵ц缁撴灉
      * @throws VciBaseException 鍙傛暟涓虹┖锛屽繀杈撻」缂哄け
      */
-    BaseResult linkEditSave(FormLinkDataDTO formLinkDataDTO) throws VciBaseException;
+    BaseResult linkEditSave(FormLinkDataDTO formLinkDataDTO) throws VciBaseException, PLException;
 
     /**
      * 鍒犻櫎閾炬帴绫诲瀷
@@ -233,7 +233,7 @@
      * @param pageHelper 鍒嗛〉鐨勫伐鍏�
      * @return 鍒楄〃鏁版嵁
      */
-    DataGrid referDataGrid(ReferConfigVO referConfigVO, PageHelper pageHelper);
+    DataGrid referDataGrid(ReferConfigVO referConfigVO, PageHelper pageHelper) throws PLException;
 
     /**
      * 鑾峰彇鏍戝舰鐨勫弬鐓�
diff --git a/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/service/impl/OsActionServiceImpl.java b/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/service/impl/OsActionServiceImpl.java
index a79ae49..8f6454e 100644
--- a/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/service/impl/OsActionServiceImpl.java
+++ b/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/service/impl/OsActionServiceImpl.java
@@ -186,7 +186,8 @@
     @Override
     public BaseResult getActionTableData(PLActionQueryDTO dto) throws PLException {
         Constraint[] consArray ;
-        if(StringUtils.isNotBlank(dto.getPlactioncls())){
+        //杩欏効瑕佺敤!=null鎺у埗锛屾煡璇㈡湭鍒嗙被鑺傜偣鐨勬椂鍊欎紶鐨�""
+        if(dto.getPlactioncls() != null){
             consArray = new Constraint[7];
             consArray[6] = new Constraint("plactioncls", dto.getPlactioncls().equals("root") ? "": dto.getPlactioncls());
         }else {
diff --git a/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/service/impl/OsBtmServiceImpl.java b/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/service/impl/OsBtmServiceImpl.java
index 2eff972..4b60a12 100644
--- a/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/service/impl/OsBtmServiceImpl.java
+++ b/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/service/impl/OsBtmServiceImpl.java
@@ -246,7 +246,7 @@
             vo.setDelimiter(btmItem.delimiter);
             vo.setfName(btmItem.fName);
             vo.setVersionRule(String.valueOf(btmItem.verRuleName));
-            if (StringUtils.isNotBlank(vo.getRevisionRuleName()) || vo.isInputRevisionFlag()) {
+            if (StringUtils.isNotBlank(vo.getRevisionRuleId()) || vo.isInputRevisionFlag()) {
                 vo.setRevisionFlag(true);
             }
             vo.setLifeCycleIds(Arrays.stream(btmItem.lifeCycles).collect(Collectors.joining(",")));
@@ -313,6 +313,25 @@
         }
         return self.selectAllBtmMap().getOrDefault(id.toLowerCase(), null);
     }
+
+    /**
+     * 浣跨敤绫诲瀷鍚嶈幏鍙栦笟鍔$被鍨�,鏌ヤ笉鍒扮洿鎺ユ姤閿�
+     * @param btmName 绫诲瀷鍚�
+     * @return 涓氬姟绫诲瀷
+     * @throws
+     */
+    @Override
+    public OsBtmTypeVO getBtmByName(String btmName) throws PLException{
+        if(Func.isBlank(btmName)){
+            throw new PLException("500",new String[]{"鏌ヨ鏉′欢绫诲瀷鍚嶄笉鑳戒负绌猴紒"});
+        }
+        BizType bizType = platformClientUtil.getBtmService().getBizTypeByName(btmName);
+        if(Func.isEmpty(bizType) || Func.isBlank(bizType.oid)){
+            throw new PLException("500",new String[]{"鏍规嵁銆�"+btmName+"銆戞湭鏌ヨ鍒板搴斾笟鍔$被鍨嬶紒"});
+        }
+        return btmDO2VO(bizType,null);
+    }
+
     /**
      * 浣跨敤缂栧彿鑾峰彇涓氬姟绫诲瀷
      *
diff --git a/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/service/impl/OsPortalVIServiceImpl.java b/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/service/impl/OsPortalVIServiceImpl.java
index b1486a2..4f196fe 100644
--- a/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/service/impl/OsPortalVIServiceImpl.java
+++ b/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/service/impl/OsPortalVIServiceImpl.java
@@ -53,7 +53,7 @@
 import java.util.stream.Collectors;
 
 /*
-  * 閾炬帴绫诲瀷鏈嶅姟
+ * 琛ㄥ崟/琛ㄦ牸鏈嶅姟
  * @author xiej
  * @date 2024-08-14
 */
@@ -211,7 +211,13 @@
                 if (formFlag) {
                     throw new Throwable(viewName + "鏁版嵁宸茬粡琚玌I缁勪欢寮曠敤锛岃閲嶆柊閫夋嫨瑕佸垹闄ょ殑瀵硅薄!");
                 }
-                UITools.getService().deletePortalVIByID(id);
+                PortalVI portalVI = new PortalVI();
+                portalVI.id = portalVIDTO.getId();
+                portalVI.viName = portalVIDTO.getViName();
+                portalVI.viType = portalVIDTO.getViType();
+                portalVI.typeName = portalVIDTO.getTypeName();
+                portalVI.typeFlag = portalVIDTO.getTypeFlag();
+                platformClientUtil.getPortalService().deletePortalVI(portalVI);
             }
         }catch (Throwable e){
             String exceptionMessage = "鍒犻櫎琛ㄥ崟鏃跺嚭鐜伴敊璇紝鍘熷洜锛�" + VciBaseUtil.getExceptionMessage(e);
@@ -224,20 +230,26 @@
     @Override
     public boolean delete(String ids) throws PLException {
         VciBaseUtil.alertNotNull(ids,"涓婚敭");
-         List<String> idsList=  VciBaseUtil.str2List(ids);
-        List<PortalVI> PortalVIList= new ArrayList<>();
-        DeletePortalVIDTOList portalVIDTOList=new DeletePortalVIDTOList();
+        List<String> idsList =  VciBaseUtil.str2List(ids);
+        List<PortalVIDTO> portalVIDTOList = new ArrayList<>();
+        DeletePortalVIDTOList deletePortalVIDTOList=new DeletePortalVIDTOList();
         idsList.stream().forEach(id->{
             PortalVI portalVI= null;
             try {
                 portalVI = platformClientUtil.getPortalService().getPortalVIById(id);
-                PortalVIList.add(portalVI);
+                PortalVIDTO portalVIDTO = new PortalVIDTO();
+                portalVIDTO.setId(portalVI.id);
+                portalVIDTO.setTypeFlag(portalVI.typeFlag);
+                portalVIDTO.setTypeName(portalVI.typeName);
+                portalVIDTO.setViName(portalVI.viName);
+                portalVIDTO.setViType(portalVI.viType);
+                portalVIDTOList.add(portalVIDTO);
             } catch (PLException e) {
                 e.printStackTrace();
             }
         });
-        portalVIDTOList.setPortalVIDTOList(portalVIO2DTOS(PortalVIList));
-        return delete(portalVIDTOList);
+        deletePortalVIDTOList.setPortalVIDTOList(portalVIDTOList);
+        return delete(deletePortalVIDTOList);
     }
 
     /**
@@ -648,7 +660,7 @@
         try {
             VciBaseUtil.alertNotNull(
                     portalVIDTO.getViName(),"鍚嶇О"
-                    ,portalVIDTO.getPrm().getFormQtName(),"缁戝畾琛ㄥ崟");
+                    /*,portalVIDTO.getPrm().getFormQtName(),"缁戝畾琛ㄥ崟"*/);
             if(portalVIDTO.getPrm()==null||portalVIDTO.getPrm().getPrmItemList()==null||portalVIDTO.getPrm().getPrmItemList().size()==0){
                 throw  new Throwable(labelName+"锛屾湭璁剧疆");
             }
@@ -692,7 +704,7 @@
             }else{
                 flag=platformClientUtil.getPortalService().judgeUpdateButton(portalVIDTO.getTypeFlag(), portalVIDTO.getViName(), portalVIDTO.getTypeName());
             }
-            PortalVI pvi=portalVIDTOO2VI(portalVIDTO);
+            PortalVI pvi = portalVIDTOO2VI(portalVIDTO);
             if (!isEdit) {
                 flag= platformClientUtil.getPortalService().savePortalVI(pvi);
             } else {
@@ -801,7 +813,7 @@
      */
     @Override
     public List<PortalVIDTO> portalVIO2DTOS(Collection<PortalVI> PortalVIS) {
-        List<PortalVIDTO>PortalVIDTOS  = new ArrayList<>();
+        List<PortalVIDTO> PortalVIDTOS = new ArrayList<>();
         Optional.ofNullable(PortalVIS).orElseGet(()->new ArrayList<>()).stream().forEach(PortalVI -> {
             PortalVIDTO PPortalVIDTO = portalVIO2DTO(PortalVI);
             PortalVIDTOS.add(PPortalVIDTO);
@@ -809,15 +821,13 @@
         return PortalVIDTOS;
     }
 
-
-
     /**
      * 琛ㄥ崟鐨勬暟鎹璞¤浆鎹负鏄剧ず瀵硅薄
      * @param portalVIDTO
      * @return
      */
     @Override
-    public  PortalVI portalVIDTOO2VI(PortalVIDTO portalVIDTO) {
+    public PortalVI portalVIDTOO2VI(PortalVIDTO portalVIDTO) {
         PortalVI portalVI = new PortalVI();
         portalVI.id = portalVIDTO.getId();
         portalVI.typeFlag = portalVIDTO.getTypeFlag();
diff --git a/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/service/impl/UIDataServiceImpl.java b/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/service/impl/UIDataServiceImpl.java
index 30f044b..b526924 100644
--- a/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/service/impl/UIDataServiceImpl.java
+++ b/Source/plt-web/plt-web-parent/plt-web/src/main/java/com/vci/web/service/impl/UIDataServiceImpl.java
@@ -2,6 +2,7 @@
 
 import com.vci.corba.common.PLException;
 import com.vci.corba.framework.data.UserInfo;
+import com.vci.corba.omd.btm.BizType;
 import com.vci.corba.omd.data.*;
 import com.vci.corba.omd.lcm.LifeCycle;
 import com.vci.dto.*;
@@ -176,7 +177,8 @@
             queryFieldList.addAll(linkTypeVO.getAttributes().stream().map(OsLinkTypeAttributeVO::getId).collect(Collectors.toList()));
             queryFieldList.addAll(WebLoServiceImpl.LO_BASE_FIELD_MAP.values());
         }else{
-            btmTypeVO = btmService.getBtmById(dataGridQuery.getBtmname());
+            //btmTypeVO = btmService.getBtmById(dataGridQuery.getBtmname());
+            btmTypeVO = btmService.getBtmByName(dataGridQuery.getBtmname());
             queryFieldList.addAll(btmTypeVO.getAttributes().stream().map(OsBtmTypeAttributeVO::getId).collect(Collectors.toList()));
             queryFieldList.addAll(WebBoServiceImpl.BO_BASE_FIELD_MAP.values());
         }
@@ -197,8 +199,9 @@
             }
             return loService.queryGridByScheme(linkTypeDataQuery);
         }else {
-            return boService.queryGridByScheme(queryTemplate,
+            DataGrid dataGrid = boService.queryGridByScheme(queryTemplate,
                     dataGridQuery.getConditionMap(), replaceMap, dataGridQuery.getPageHelper(), queryFieldList.stream().collect(Collectors.toList()));
+            return dataGrid;
         }
         //鐢熷懡鍛ㄦ湡鍦ㄥ叾涓煡璇㈠悗灏变細澶勭悊
         //鏋氫妇涔熶細琚鐞嗕簡
@@ -212,7 +215,7 @@
      * @throws VciBaseException 鏌ヨ鍑洪敊鐨勬椂鍊欎細鎶涘嚭寮傚父
      */
     @Override
-    public UIFormDataVO getDataForForm(UIFormQuery formQuery) throws VciBaseException {
+    public UIFormDataVO getDataForForm(UIFormQuery formQuery) throws VciBaseException, PLException {
         VciBaseUtil.alertNotNull(formQuery,"琛ㄥ崟鐨勬煡璇㈠璞�",formQuery.getBtmname(),"涓氬姟绫诲瀷鐨勪俊鎭�",formQuery.getOid(),"涓氬姟鏁版嵁鐨勪富閿�",formQuery.getFormDefineId(),"琛ㄥ崟鐨勫畾涔夌紪鍙�");
         UIFormDefineVO formDefineVO = uiEngineService.getFormById(formQuery.getBtmname(),formQuery.getFormDefineId());
         String queryTemplate = !CollectionUtils.isEmpty(formQuery.getSourceData())?formQuery.getSourceData().getOrDefault("querytemplate",formDefineVO.getQueryTemplateName()):formDefineVO.getQueryTemplateName();
@@ -242,7 +245,7 @@
             queryFieldList.addAll(linkTypeVO.getAttributes().stream().map(OsLinkTypeAttributeVO::getId).collect(Collectors.toList()));
             queryFieldList.addAll(WebLoServiceImpl.LO_BASE_FIELD_MAP.values());
         }else{
-            btmTypeVO = btmService.getBtmById(formQuery.getBtmname());
+            btmTypeVO = btmService.getBtmByName(formQuery.getBtmname());
             queryFieldList.addAll(btmTypeVO.getAttributes().stream().map(OsBtmTypeAttributeVO::getId).collect(Collectors.toList()));
         }
         queryFieldList.add("creator_name");
@@ -1054,7 +1057,7 @@
      * @throws VciBaseException 淇濆瓨鍑洪敊鐨勬椂鍊欎細鎶涘嚭寮傚父
      */
     @Override
-    public BaseResult<Map<String, Object>> addSave(FormDataDTO formDataDTO) throws VciBaseException {
+    public BaseResult<Map<String, Object>> addSave(FormDataDTO formDataDTO) throws VciBaseException, PLException {
         //棣栧厛鍒ゆ柇瀵硅薄鏄惁涓虹┖
         VciBaseUtil.alertNotNull(formDataDTO,"娣诲姞鐨勬暟鎹璞�",formDataDTO.getBtmname(),"涓氬姟绫诲瀷鐨勫悕绉�",formDataDTO.getFormDefineId(),"琛ㄥ崟瀹氫箟鐨勭紪鍙�");
         UIFormDefineVO formDefineVO = uiEngineService.getFormById(formDataDTO.getBtmname(), formDataDTO.getFormDefineId());
@@ -1110,7 +1113,7 @@
      * @param newVersion 鏂扮増娆�
      * @return  鎵ц鐨勭粨鏋�
      */
-    private BaseResult<BusinessObject> wrapperCbo(FormDataDTO formDataDTO,UIFormDefineVO formDefineVO,boolean editFlag,boolean newRevision,boolean newVersion){
+    private BaseResult<BusinessObject> wrapperCbo(FormDataDTO formDataDTO,UIFormDefineVO formDefineVO,boolean editFlag,boolean newRevision,boolean newVersion) throws PLException {
         //鎵╁睍灞炴�х殑鍊�
         Map<String, String> data = formDataDTO.getData();
         Map<String,String> dataLow = new HashMap<>();
@@ -1319,7 +1322,7 @@
      * @throws VciBaseException 淇濆瓨鍑洪敊鐨勬椂鍊欎細鎶涘嚭寮傚父
      */
     @Override
-    public BaseResult<String> batchAddSave(FormDataDTOList formDataDTOList) throws VciBaseException {
+    public BaseResult<String> batchAddSave(FormDataDTOList formDataDTOList) throws VciBaseException, PLException {
         VciBaseUtil.alertNotNull(formDataDTOList,"瑕佹坊鍔犵殑鏁版嵁",formDataDTOList.getFormDataDTOS(),"瑕佹坊鍔犵殑鏁版嵁");
         //棣栧厛鍒ゆ柇瀵硅薄鏄惁涓虹┖
         FormDataDTO firstFormDataDTO = formDataDTOList.getFormDataDTOS().stream().findFirst().get();
@@ -1389,7 +1392,7 @@
      * @throws VciBaseException 淇濆瓨鍑洪敊鐨勬椂鍊欎細鎶涘嚭寮傚父
      */
     @Override
-    public BaseResult<Map<String, Object>> editSave(FormDataDTO formDataDTO) throws VciBaseException {
+    public BaseResult<Map<String, Object>> editSave(FormDataDTO formDataDTO) throws VciBaseException, PLException {
         //棣栧厛鍒ゆ柇瀵硅薄鏄惁涓虹┖
         VciBaseUtil.alertNotNull(formDataDTO,"淇敼鐨勬暟鎹璞�",formDataDTO.getBtmname(),"涓氬姟绫诲瀷鐨勫悕绉�",formDataDTO.getFormDefineId(),"琛ㄥ崟瀹氫箟鐨勭紪鍙�");
         UIFormDefineVO formDefineVO = uiEngineService.getFormById(formDataDTO.getBtmname(), formDataDTO.getFormDefineId());
@@ -1493,7 +1496,7 @@
      * @throws VciBaseException 淇濆瓨鍑洪敊鐨勬椂鍊欎細鎶涘嚭寮傚父
      */
     @Override
-    public BaseResult<String> batchEditSave(FormDataDTOList formDataDTOList) throws VciBaseException {
+    public BaseResult<String> batchEditSave(FormDataDTOList formDataDTOList) throws VciBaseException, PLException {
         VciBaseUtil.alertNotNull(formDataDTOList,"瑕佷慨鏀圭殑鏁版嵁",formDataDTOList.getFormDataDTOS(),"瑕佷慨鏀圭殑鏁版嵁");
         //棣栧厛鍒ゆ柇瀵硅薄鏄惁涓虹┖
         FormDataDTO firstFormDataDTO = formDataDTOList.getFormDataDTOS().stream().findFirst().get();
@@ -1550,7 +1553,7 @@
      * @throws VciBaseException 鏁版嵁琚紩鐢ㄧ殑鏃跺�欎細鎶涘嚭寮傚父
      */
     @Override
-    public BaseResult batchDelete(DeleteDataDTO deleteDataDTO) throws VciBaseException {
+    public BaseResult batchDelete(DeleteDataDTO deleteDataDTO) throws VciBaseException, PLException {
         VciBaseUtil.alertNotNull(deleteDataDTO,"鏁版嵁浼犺緭瀵硅薄",deleteDataDTO.getDataList(),"鏁版嵁浼犺緭瀵硅薄");
         String btmName = deleteDataDTO.getDataList().get(0).getBtmname();
         List<String> oidList = deleteDataDTO.getDataList().stream().map(BaseModelDTO::getOid).collect(Collectors.toList());
@@ -1558,7 +1561,7 @@
         List<BusinessObject> cbo = null;
         if(deleteDataDTO.isCascade()){
             //绾ц仈鍒犻櫎
-            OsBtmTypeVO btmTypeVO = btmService.getBtmById(btmName);
+            OsBtmTypeVO btmTypeVO = btmService.getBtmByName(btmName);
             OsBtmTypeAttributeVO parentAttributeVO = btmTypeVO.getAttributes().stream().filter(s -> s.getReferBtmTypeId().equalsIgnoreCase(btmName)).findFirst().orElseGet(null);
             if(parentAttributeVO != null){
                 //椤甸潰鍒嗛〉涓嶈兘鏄剧ず瓒呰繃1000
@@ -1639,7 +1642,7 @@
      * @throws VciBaseException 鍙傛暟涓虹┖锛屽繀杈撻」缂哄け
      */
     @Override
-    public BaseResult<String> linkAddSave(FormLinkDataDTO formLinkDataDTO) throws VciBaseException {
+    public BaseResult<String> linkAddSave(FormLinkDataDTO formLinkDataDTO) throws VciBaseException, PLException {
         //棣栧厛鍒ゆ柇瀵硅薄鏄惁涓虹┖
         VciBaseUtil.alertNotNull(formLinkDataDTO,"娣诲姞鐨勬暟鎹璞�",formLinkDataDTO.getLinkType(),"閾炬帴绫诲瀷鐨勫悕绉�",formLinkDataDTO.getFormDefineId(),"琛ㄥ崟瀹氫箟鐨勭紪鍙�");
         if(formLinkDataDTO.getData() ==null){
@@ -1815,7 +1818,7 @@
      * @param boData to鐨勬暟鎹�
      * @return 鍖呭惈鐨勫璞�
      */
-    private BaseResult<BusinessObject> wrapperToCbo(FormLinkDataDTO formLinkDataDTO,UIFormDefineVO formDefineVO,String toOid,String toBtmName,Map<String,String> boData){
+    private BaseResult<BusinessObject> wrapperToCbo(FormLinkDataDTO formLinkDataDTO,UIFormDefineVO formDefineVO,String toOid,String toBtmName,Map<String,String> boData) throws PLException {
         Map<String,String> dataLow = new HashMap<>();
         boData.forEach((key,value)->{
             dataLow.put(key.toLowerCase(),value);
@@ -1935,14 +1938,15 @@
      * @param newVersion 鏄惁鍗囩増娆�
      * @return cbo瀵硅薄
      */
-    public BusinessObject createOrGetCbo(Map<String,String> dataLowMap,Map<String,String> baseDataMap,boolean editFlag,boolean newRevision,boolean newVersion){
+    public BusinessObject createOrGetCbo(Map<String,String> dataLowMap,Map<String,String> baseDataMap,boolean editFlag,boolean newRevision,boolean newVersion) throws PLException {
         String btmName = baseDataMap.get("btmname");
         String oid = baseDataMap.get("oid");
 //        BusinessObject cbo = new BusinessObject();
         BusinessObject cbo = new BusinessObject();
         String copyfromversion = baseDataMap.get("copyfromversion");
-        OsBtmTypeVO btmTypeVO = btmService.getBtmById(btmName);
-        List<String> attributeList = btmTypeVO.getAttributes().stream().map(attribute -> attribute.getId()).collect(Collectors.toList());
+        //OsBtmTypeVO btmTypeVO = btmService.getBtmById(btmName);
+        OsBtmTypeVO btmTypeVO = btmService.getBtmByName(btmName);
+        //List<String> attributeList = btmTypeVO.getAttributes().stream().map(attribute -> attribute.getId()).collect(Collectors.toList());
         if(editFlag || newRevision || newVersion){
             try {
                 cbo = platformClientUtil.getBOFService().readBusinessObject(editFlag?oid:copyfromversion,btmName);
@@ -2038,6 +2042,7 @@
             if(StringUtils.isBlank(cbo.btName)){
                 cbo.btName = btmTypeVO.getId();
             }
+
             if(btmTypeVO.isRevisionFlag()){
                 //瑕佺鐞嗙増鏈�
                 if(btmTypeVO.isInputRevisionFlag() && StringUtils.isNotBlank(baseDataMap.getOrDefault("revisionvalue",""))){
@@ -2077,7 +2082,16 @@
 //            }
 //        }
         setValueToCbo(dataLowMap,baseDataMap,cbo,editFlag);
-//        cbo.setName(dataLowMap.get("name"));
+        //TODO:榛樿灞炴�ч渶瑕佹斁鍦╟bo澶栧眰
+        if(StringUtils.isNotBlank(baseDataMap.getOrDefault("id",""))){
+            cbo.id = baseDataMap.getOrDefault("id","");
+        }
+        if(StringUtils.isNotBlank(baseDataMap.getOrDefault("name",""))){
+            cbo.name = baseDataMap.getOrDefault("name","");
+        }
+        if(StringUtils.isNotBlank(baseDataMap.getOrDefault("description",""))){
+            cbo.description = baseDataMap.getOrDefault("description","");
+        }
         return cbo;
     }
 
@@ -2141,7 +2155,7 @@
      * @throws VciBaseException 鍙傛暟涓虹┖锛屽繀杈撻」缂哄け
      */
     @Override
-    public BaseResult linkEditSave(FormLinkDataDTO formLinkDataDTO) throws VciBaseException {
+    public BaseResult linkEditSave(FormLinkDataDTO formLinkDataDTO) throws VciBaseException, PLException {
         VciBaseUtil.alertNotNull(formLinkDataDTO,"淇敼鐨勬暟鎹璞�",formLinkDataDTO.getLinkType(),"閾炬帴绫诲瀷鐨勫悕绉�",
                 formLinkDataDTO.getFormDefineId(),"琛ㄥ崟瀹氫箟鐨勭紪鍙�",formLinkDataDTO.getOid(),"涓婚敭",
                 formLinkDataDTO.getFoid(),"from绔富閿�",formLinkDataDTO.getToid(),"to绔富閿�");
@@ -2328,10 +2342,10 @@
      * @return 鍒楄〃鏁版嵁
      */
     @Override
-    public DataGrid referDataGrid(ReferConfigVO referConfigVO, PageHelper pageHelper) {
+    public DataGrid referDataGrid(ReferConfigVO referConfigVO, PageHelper pageHelper) throws PLException {
         checkReferConfig(referConfigVO);
         //浣跨敤涓氬姟绫诲瀷鏌ヨ
-        OsBtmTypeVO btmById = btmService.getBtmById(referConfigVO.getReferBo());
+        OsBtmTypeVO btmById = btmService.getBtmByName(referConfigVO.getReferBo());
         if(referConfigVO.getConditionMap() == null){
             referConfigVO.setConditionMap(new HashMap<>());
         }
diff --git a/Source/plt-web/plt-web-parent/plt-web/src/main/resources/menuConfig.json b/Source/plt-web/plt-web-parent/plt-web/src/main/resources/menuConfig.json
index a40e583..3776823 100644
--- a/Source/plt-web/plt-web-parent/plt-web/src/main/resources/menuConfig.json
+++ b/Source/plt-web/plt-web-parent/plt-web/src/main/resources/menuConfig.json
@@ -10,6 +10,7 @@
         "parentId": "VCIBaseTreeNode",
         "code": "systemManagmentNode",
         "alias": "system",
+        "category": "0",
         "meta": {
           "keepAlive": false
         },
@@ -25,6 +26,7 @@
         "parentId": "VCIBaseTreeNode",
         "code": "modelManagmentNode",
         "alias": "model",
+        "category": "0",
         "meta": {
           "keepAlive": false
         },
@@ -40,6 +42,7 @@
         "parentId": "VCIBaseTreeNode",
         "code": "operateNode",
         "alias": "operate",
+        "category": "0",
         "meta": {
           "keepAlive": false
         },
@@ -55,6 +58,7 @@
         "parentId": "VCIBaseTreeNode",
         "code": "sysOptionNode",
         "alias": "sysOption",
+        "category": "0",
         "meta": {
           "keepAlive": false
         },
@@ -70,6 +74,7 @@
         "parentId": "VCIBaseTreeNode",
         "code": "sysMonitorNode",
         "alias": "sysMonitor",
+        "category": "0",
         "meta": {
           "keepAlive": false
         },
@@ -83,6 +88,7 @@
     "parentId": "systemManagmentNode",
     "code": "rootNode",
     "alias": "root",
+    "category": "0",
     "meta": {
       "keepAlive": false
     },
@@ -99,6 +105,7 @@
     "parentId": "VCIBaseTreeNode",
     "code": "systemManagmentNode",
     "alias": "system",
+    "category": "0",
     "meta": {
       "keepAlive": false
     },
@@ -115,6 +122,7 @@
     "parentId": "VCIBaseTreeNode",
     "code": "modelManagmentNode",
     "alias": "model",
+    "category": "0",
     "meta": {
       "keepAlive": false
     },
@@ -131,6 +139,7 @@
     "parentId": "VCIBaseTreeNode",
     "code": "operateNode",
     "alias": "operate",
+    "category": "0",
     "meta": {
       "keepAlive": false
     },

--
Gitblit v1.9.3