From 166e3b68ce813461a6d8026efbc7fad2925d43ef Mon Sep 17 00:00:00 2001
From: lihang <lihang@vci-tech.com>
Date: 星期二, 04 七月 2023 18:39:04 +0800
Subject: [PATCH] Merge branch 'master' of http://dev.vci-tech.com:1065/r/ubcs

---
 Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/dto/CodeClassifyTemplateAttrDTO.java          |   96 ++++++++++++-----------
 Source/UBCS-WEB/src/components/Tree/classifyTrees.vue                                                                    |    4 
 Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/MdmIOServiceImpl.java                    |    8 +-
 Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/CodeClassifyTemplateAttrServiceImpl.java |   12 +-
 Source/UBCS-WEB/src/components/Crud/VciMasterCrud.vue                                                                    |   15 ---
 Source/UBCS-WEB/src/components/template/SetPersonnel.vue                                                                 |    9 +
 Source/UBCS-WEB/vue.config.js                                                                                            |    4 
 Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/vo/pagemodel/CodeImprotParmaDatVO.java        |    8 +-
 Source/UBCS-WEB/src/components/work/BusinessWork.vue                                                                     |    4 -
 Source/UBCS-WEB/src/components/Tree/attrCrud.vue                                                                         |   52 ++++++------
 10 files changed, 100 insertions(+), 112 deletions(-)

diff --git a/Source/UBCS-WEB/src/components/Crud/VciMasterCrud.vue b/Source/UBCS-WEB/src/components/Crud/VciMasterCrud.vue
index 21a5b5f..6cafeb2 100644
--- a/Source/UBCS-WEB/src/components/Crud/VciMasterCrud.vue
+++ b/Source/UBCS-WEB/src/components/Crud/VciMasterCrud.vue
@@ -64,17 +64,6 @@
             :show-overflow-tooltip="true"
             align="center"
           >
-            <!-- 缂栬緫鍜屽睍绀洪�昏緫 -->
-            <!--              <template slot-scope="{ row }">-->
-            <!--                <el-input v-if="editingRow === row && editShow== item.prop" v-model="row[item.prop]" @blur="saveRow"></el-input>-->
-            <!--                <span v-else>{{row[item.prop]}}</span>-->
-            <!--                <el-switch-->
-            <!--                  v-if="editShow === 'true'"-->
-            <!--                  v-model="row[item.prop]"-->
-            <!--                  active-color="#13ce66"-->
-            <!--                  inactive-color="#ff4949">-->
-            <!--                </el-switch>-->
-            <!--              </template>-->
           </el-table-column>
         </el-table>
       </el-row>
@@ -307,9 +296,6 @@
     },
     // 鍙戝竷
     setHandler() {
-      console.log("1111");
-      console.log("鐖�", this.parameter);
-
       if (this.selectRow.length <= 0) {
         this.$message.warning("璇烽�夋嫨涓�鏉℃暟鎹�");
       } else {
@@ -453,6 +439,7 @@
       row.forEach((item) => {
         this.parameter.ids.push(item.oid);
       });
+      console.log(  '  this.parameter.ids',this.parameter.ids)
     },
     //缂栬緫
     editHandler() {
diff --git a/Source/UBCS-WEB/src/components/Tree/attrCrud.vue b/Source/UBCS-WEB/src/components/Tree/attrCrud.vue
index 68cdd6c..bedf452 100644
--- a/Source/UBCS-WEB/src/components/Tree/attrCrud.vue
+++ b/Source/UBCS-WEB/src/components/Tree/attrCrud.vue
@@ -1,9 +1,6 @@
 <template>
-
-  <!--  <avue-crud :data="ProData" :option="option" @sort-change="sortChange" @row-update="addUpdate"-->
-  <!--             @cell-click="handleRowClick" @select="selectHandle" @row-del="CrudRowDel">-->
   <div>
-    <div style="display: flex;flex-wrap: wrap;" v-if="this.crudArray.length>=1">
+    <div style="display: flex;flex-wrap: wrap;" v-if="this.crudArrayFlag">
       <!--鏂板-->
       <el-button v-if="attrEditVisible == false && attrFlagChiledren==false" size="small" type="primary"
                  @click="busineHandle">锛� 娣诲姞 {{ msg }}
@@ -37,7 +34,6 @@
       <!--    缂栫爜鐢宠棰勮-->
       <el-button size="small" @click="applicationHandle" style="">缂栫爜鐢宠棰勮</el-button>
       <!--        楠岃瘉瑙勫垯-->
-
     </div>
 <!--    寮圭獥-->
     <div>
@@ -203,7 +199,7 @@
       </el-dialog>
       <!--        鍏ㄥ睆缂栬緫-->
       <el-dialog :visible.sync="attrEditVisible" append-to-body fullscreen="true">
-        <attrCrud :ProData="this.ProData" :attrFlagChiledren="this.attrFlag"></attrCrud>
+        <attrCrud :ProData="this.ProData" :attrFlagChiledren="this.attrFlag" :crudArrayFlag="this.crudArrayFlag"></attrCrud>
       </el-dialog>
       <!--      缁勫悎瑙勫垯-->
       <formula-editor :systemVariableTableData="systemVariableTableData"
@@ -236,8 +232,7 @@
               style="width: 100%"
               @cell-click="handleCellClicks"
               @select="selectHandle"
-              v-if="this.crudArray.length>=1"
-
+              v-if="this.crudArrayFlag"
     >
       <el-table-column
         type="selection"
@@ -286,7 +281,6 @@
 
 export default {
   name: "attrCrud .vue",
-  // props: ['ProData','crudOid','crudArray','Formlist','codeClassifyOid'],
   props: {
     ProData: {
       type: Array,
@@ -309,10 +303,29 @@
       type: Boolean,
       default: false
     },
-
+    crudArrayFlag:{
+      type: Boolean,
+      default: false
+    }
+  },
+  watch:{
+    crudArray:{
+      handler(newval,oldval){
+        if(newval != undefined){
+          if(newval.length>=1){
+            this.crudArrayFlag=true
+          }else{
+            this.crudArrayFlag=false
+          }
+        }
+      },
+      deep:true,
+      immediate:true
+    }
   },
   data() {
     return {
+      crudArrayFlag:false,
       editingRows: null,
       editShows:"",
       attrFlag: false,
@@ -1169,21 +1182,10 @@
   methods: {
     formAttr(row, column) {
       console.log(row,column)
-      // if (column.property === "keyAttrFlag"
-      //   ||column.property === "queryAttrFlag"
-      //   ||column.property === "seniorQueryAttrFlag"
-      //   ||column.property === "sameRepeatAttrFlag"
-      //   ||column.property === "requireFlag"
-      //   ||column.property === "formDisplayFlag"
-      //   ||column.property === "tableDisplayFlag"
-      //   ||column.property === "sortAttrFlag") {
-      //   return row[column.property] =='true'? "鏄�" : "鍚�";
-      // }
-      // return row[column.property];
     },
     //灞炴�у垎缁勬寜閽�
     attrVisibleHandle() {
-      this.formatBoolean()
+
       if (this.CrudSelect.length > 1) {
         this.$message.warning('鍙兘閫夋嫨涓�鏉℃ā鏉垮睘鎬�')
       } else if (this.CrudSelect < 1) {
@@ -1230,14 +1232,10 @@
     },
     // 浠庝笟鍔＄被鍨嬩腑閫夋嫨鏁版嵁
     busineHandle() {
-      if (this.crudArray.length < 1) {
-        this.$message.error('璇烽�夋嫨涓�鏉℃ā鏉�')
-      } else {
         this.addVisible = true;
         AttrByBtm({'conditionMap[oid]': this.crudOid}).then(res => {
           this.businessData = res.data.data;
         })
-      }
     },
     // 绾ц仈灞炴�ф寜閽�
     CascadeHandle() {
@@ -1264,7 +1262,7 @@
     },
     //淇濆瓨
     addsHandler() {
-      batchAddSave(JSON.parse(JSON.stringify(this.ProData).replace(/classifyTemplateOid/g,"classifytemplateoid"))).then(res => {
+      batchAddSave(JSON.parse(JSON.stringify(this.ProData))).then(res => {
         this.$message.success('淇濆瓨鎴愬姛')
       })
     },
diff --git a/Source/UBCS-WEB/src/components/Tree/classifyTrees.vue b/Source/UBCS-WEB/src/components/Tree/classifyTrees.vue
index a95f7dd..6ab294c 100644
--- a/Source/UBCS-WEB/src/components/Tree/classifyTrees.vue
+++ b/Source/UBCS-WEB/src/components/Tree/classifyTrees.vue
@@ -791,8 +791,7 @@
           message: '璇峰厛浠庢爲涓婇�夋嫨涓�鏉℃暟鎹�!'
         });
       } else {
-        let codeClassifyOid = this.codeClassifyOid
-        this.$set(row, "codeclassifyoid", codeClassifyOid)
+        this.$set(row, "codeclassifyoid", this.nodeClickList.oid)
         addSave(row).then(() => {
           this.$message({
             type: "success",
@@ -807,6 +806,7 @@
           });
         })
       }
+      console.log('123',this.codeClassifyOid)
     },
     //妯℃澘绠＄悊淇敼
     CrudRowUpdata(row,index,done) {
diff --git a/Source/UBCS-WEB/src/components/template/SetPersonnel.vue b/Source/UBCS-WEB/src/components/template/SetPersonnel.vue
index a0e23bf..f637e5f 100644
--- a/Source/UBCS-WEB/src/components/template/SetPersonnel.vue
+++ b/Source/UBCS-WEB/src/components/template/SetPersonnel.vue
@@ -90,7 +90,12 @@
             },
             deep:true,
             immediate:true
-        }
+        },
+      parameter:{
+          handler(newval,oldval){
+            console.log('瀛�',newval)
+          }
+      }
     },
     data() {
         return {
@@ -112,8 +117,6 @@
     },
 
     mounted() {
-        // this.apiInit()
-        // this.apiDict()
       console.log('---',this.parameter)
     },
   created() {
diff --git a/Source/UBCS-WEB/src/components/work/BusinessWork.vue b/Source/UBCS-WEB/src/components/work/BusinessWork.vue
index 4968fdf..b4d93d0 100644
--- a/Source/UBCS-WEB/src/components/work/BusinessWork.vue
+++ b/Source/UBCS-WEB/src/components/work/BusinessWork.vue
@@ -37,8 +37,6 @@
       handler(newval,oldval){
         this.BuinessOids=newval;
         this.BuinseseRend()
-        console.log(newval)
-        console.log(this.BuinessOids)
       },
       deep:true
     }
@@ -48,8 +46,6 @@
   mounted() {
   },
   methods:{
-    HandlerRend(){
-    },
     BuinseseRend(){
       businese({
         btmType:'wupin',
diff --git a/Source/UBCS-WEB/vue.config.js b/Source/UBCS-WEB/vue.config.js
index ad43a75..4124c7c 100644
--- a/Source/UBCS-WEB/vue.config.js
+++ b/Source/UBCS-WEB/vue.config.js
@@ -26,8 +26,8 @@
     proxy: {
       '/api': {
         //鏈湴鏈嶅姟鎺ュ彛鍦板潃
-        target: 'http://localhost:37000',
-        // target: 'http://192.168.1.51:37000',
+        // target: 'http://localhost:37000',
+        target: 'http://192.168.1.51:37000',
         // target: 'http://192.168.1.46:37000',
         // target: 'http://dev.vci-tech.com:37000',
         // target: 'http://192.168.1.51:37000/',
diff --git a/Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/dto/CodeClassifyTemplateAttrDTO.java b/Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/dto/CodeClassifyTemplateAttrDTO.java
index be49c9c..da4b3a1 100644
--- a/Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/dto/CodeClassifyTemplateAttrDTO.java
+++ b/Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/dto/CodeClassifyTemplateAttrDTO.java
@@ -38,110 +38,110 @@
 	/**
 	 * 鎵�灞炴ā鏉�
 	 */
-	private String classifytemplateoid;
+	private String classifyTemplateOid;
 
 	/**
 	 * 鎵�灞炴ā鏉挎樉绀烘枃鏈�
 	 */
-	private String classifytemplateoidName;
+	private String classifyTemplateOidName;
 	/**
 	 * 鎵�灞炲垎绫讳腑鐨勫睘鎬т富閿�
 	 */
-	private String classifyattributeoid;
+	private String classifyAttributeOid;
 
 	/**
 	 * 鎵�灞炲垎绫讳腑鐨勫睘鎬т富閿樉绀烘枃鏈�
 	 */
-	private String classifyattributeoidName;
+	private String classifyAttributeOidName;
 	/**
 	 * 灞炴�х殑绫诲瀷
 	 */
-	private String attributedatatype;
+	private String attributeDataType;
 
 	/**
 	 * 鏄惁鍏抽敭灞炴��
 	 */
-	private String keyattrflag;
+	private String keyAttrFlag;
 
 	/**
 	 * 鏄惁蹇�熸煡璇㈠睘鎬�
 	 */
-	private String queryattrflag;
+	private String queryAttrFlag;
 
 	/**
 	 * 鏄惁楂樼骇鏌ヨ灞炴��
 	 */
-	private String seniorqueryattrflag;
+	private String seniorQueryAttrFlag;
 
 	/**
 	 * 鐩镐技鏌ラ噸灞炴��
 	 */
-	private String samerepeatattrflag;
+	private String sameRepeatAttrFlag;
 
 	/**
 	 * 鏄惁鎺掑簭
 	 */
-	private String sortattrflag;
+	private String sortAttrFlag;
 
 	/**
 	 * 鏄惁鐢熸垚浜岀淮鐮�
 	 */
-	private String qrcodeflag;
+	private String qrcodeFlag;
 
 	/**
 	 * 鏄惁鐢熸垚涓�缁寸爜
 	 */
-	private String barcodeflag;
+	private String barcodeFlag;
 
 	/**
 	 * 缁勫悎瑙勫垯
 	 */
-	private String componentrule;
+	private String componentRule;
 
 	/**
 	 * 楠岃瘉瑙勫垯
 	 */
-	private String verifyrule;
+	private String verifyRule;
 
 	/**
 	 * 鍒嗙被娉ㄥ叆灞傜骇
 	 */
-	private String classifyinvokelevel;
+	private String classifyInvokeLevel;
 
 	/**
 	 * 鍒嗙被娉ㄥ叆鐨勫睘鎬ц嫳鏂囧悕绉�
 	 */
-	private String classifyinvokeattr;
+	private String classifyInvokeAttr;
 
 	/**
 	 * 鍒嗙被娉ㄥ叆鐨勫睘鎬т腑鏂囧悕绉�
 	 */
-	private String classifyinvokeattrname;
+	private String classifyInvokeAttrName;
 
 	/**
 	 * 鍒嗙被娉ㄥ叆鏄惁鍙互缂栬緫
 	 */
-	private String classifyinvokeeditflag;
+	private String classifyInvokeEditFlag;
 
 	/**
 	 * 鐮佸�煎簭鍙�
 	 */
-	private Integer ordernum;
+	private Integer orderNum;
 
 	/**
 	 * 琛ㄥ崟閲屾槸鍚︽樉绀�
 	 */
-	private String formdisplayflag;
+	private String formDisplayFlag;
 
 	/**
 	 * 鍒楄〃閲屾槸鍚︽樉绀�
 	 */
-	private String tabledisplayflag;
+	private String tableDisplayFlag;
 
 	/**
 	 * 鎵�灞炲睘鎬у垎缁�
 	 */
-	private String attributegroup;
+	private String attributeGroup;
 
 	/**
 	 * 浣跨敤鏋氫妇娉ㄥ叆鐨勫瓧绗︿覆鏍煎紡
@@ -151,27 +151,27 @@
 	/**
 	 * 浣跨敤鏋氫妇鑻辨枃缂栧彿
 	 */
-	private String enumid;
+	private String enumId;
 
 	/**
 	 * 浣跨敤鏋氫妇涓枃鍚嶇О
 	 */
-	private String enumname;
+	private String enumName;
 
 	/**
 	 * 鏋氫妇鏄惁鍙互缂栬緫
 	 */
-	private String enumeditflag;
+	private String enumEditFlag;
 
 	/**
 	 * 鍙傜収鐨勪笟鍔＄被鍨嬭嫳鏂囧悕绉�
 	 */
-	private String referbtmid;
+	private String referBtmId;
 
 	/**
 	 * 鍙傜収鐨勪笟鍔＄被鍨嬩腑鏂囧悕绉�
 	 */
-	private String referbtmname;
+	private String referBtmName;
 
 	/**
 	 * 鍙傜収绐楀彛閰嶇疆
@@ -181,97 +181,97 @@
 	/**
 	 * 鏄惁蹇呰緭
 	 */
-	private String requireflag;
+	private String requireFlag;
 
 	/**
 	 * 鏄惁鍙
 	 */
-	private String readonlyflag;
+	private String readOnlyFlag;
 
 	/**
 	 * 灞炴�ф帶鍒惰緭鍏ョ殑闀垮害
 	 */
-	private Integer controllength;
+	private Integer controlLength;
 
 	/**
 	 * 琛ㄥ崟閲屾樉绀虹殑鏍峰紡
 	 */
-	private String formdisplaystyle;
+	private String formDisplayStyle;
 
 	/**
 	 * 琛ㄦ牸閲屾樉绀虹殑鏍峰紡
 	 */
-	private String tabledisplaystyle;
+	private String tableDisplayStyle;
 
 	/**
 	 * 琛ㄥ崟涓秴閾炬帴鍐呭
 	 */
-	private String formhref;
+	private String formHref;
 
 	/**
 	 * 琛ㄦ牸涓秴閾炬帴鍐呭
 	 */
-	private String tablehref;
+	private String tableHref;
 
 	/**
 	 * 灏忔暟绮惧害
 	 */
-	private Integer precisionlength;
+	private Integer precisionLength;
 
 	/**
 	 * 灏忔暟鍒诲害
 	 */
-	private Integer scalelength;
+	private Integer scaleLength;
 
 	/**
 	 * 鍙栧�艰寖鍥�
 	 */
-	private String valuearea;
+	private String valueArea;
 
 	/**
 	 * 鏃堕棿鏍煎紡
 	 */
-	private String codedateformat;
+	private String codeDateFormat;
 
 	/**
 	 * 琛ㄦ牸閲屾樉绀鸿皟鐢ㄧ殑js
 	 */
-	private String tabledisplayjs;
+	private String tableDisplayJs;
 
 	/**
 	 * 鏄惁鏄剧ず澶氳鏂囨湰
 	 */
-	private String textareaflag;
+	private String textAreaFlag;
 
 	/**
 	 * 棰勮鍥�
 	 */
-	private String imageflag;
+	private String imageFlag;
 
 	/**
 	 * 榛樿鍊�
 	 */
-	private String defaultvalue;
+	private String defaultValue;
 
 	/**
 	 * 鍓嶇紑
 	 */
-	private String prefixvalue;
+	private String prefixValue;
 
 	/**
 	 * 鍚庣紑
 	 */
-	private String suffixvalue;
+	private String suffixValue;
 
 	/**
 	 * 閫夋嫨鏁版嵁鏃惰繃婊ょ殑灞炴��
 	 */
-	private String filtersourceattr;
+	private String filterSourceAttr;
 
 	/**
 	 * 閫夋嫨鏁版嵁鏃惰繃婊ょ殑灞炴�у悕绉�
 	 */
-	private String filtersourceattrname;
+	private String filterSourceAttrName;
 
 	/**
 	 * 灞炴�у垪琛ㄤ腑鐨勫搴�
@@ -306,5 +306,9 @@
 	 */
 	//@Column(columnDefinition = "绾ц仈鏌ヨ灞炴��")
 	private String parentQueryAttr;
+	/**
+	 * 杈撳叆鎻愮ず
+	 */
+	private String inputTip;
 
 }
diff --git a/Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/vo/pagemodel/CodeImprotParmaDatVO.java b/Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/vo/pagemodel/CodeImprotParmaDatVO.java
index ac03baf..cc5b2f9 100644
--- a/Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/vo/pagemodel/CodeImprotParmaDatVO.java
+++ b/Source/UBCS/ubcs-service-api/ubcs-code-api/src/main/java/com/vci/ubcs/code/vo/pagemodel/CodeImprotParmaDatVO.java
@@ -5,7 +5,7 @@
 public class CodeImprotParmaDatVO {
     private List<CodeImprotSaveDatVO> codeImprotSaveDatVOList;
     private String classifyAttr;
-    private Boolean isImprot;
+    private Boolean improt;
 
     public List<CodeImprotSaveDatVO> getCodeImprotSaveDatVOList() {
         return codeImprotSaveDatVOList;
@@ -24,18 +24,18 @@
     }
 
     public Boolean getImprot() {
-        return isImprot;
+        return this.improt;
     }
 
     public void setImprot(Boolean improt) {
-        isImprot = improt;
+        this.improt = improt;
     }
 
     @Override
     public String toString() {
         return "CodeImprotParmaDatVO{" +
                 "codeImprotSaveDatVOList=" + codeImprotSaveDatVOList +
-                ", isImprot=" + isImprot +
+                ", isImprot=" + improt +
                 '}';
     }
 }
diff --git a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/CodeClassifyTemplateAttrServiceImpl.java b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/CodeClassifyTemplateAttrServiceImpl.java
index 68256fb..10740cd 100644
--- a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/CodeClassifyTemplateAttrServiceImpl.java
+++ b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/CodeClassifyTemplateAttrServiceImpl.java
@@ -36,7 +36,7 @@
 import com.vci.ubcs.starter.web.util.VciDateUtil;
 import com.vci.ubcs.system.entity.DictBiz;
 import com.vci.ubcs.system.feign.IDictBizClient;
-import org.springblade.core.log.exception.ServiceException;
+import com.vci.ubcs.core.log.exception.ServiceException;
 import org.springblade.core.mp.support.Condition;
 import org.springblade.core.mp.support.Query;
 import org.springblade.core.tool.api.R;
@@ -398,7 +398,7 @@
 				throw new VciBaseException("{0}{1}灞炴�х殑鏃堕棿鏍煎紡涓嶇鍚堣姹�",new String[]{codeClassifyTemplateAttrDO.getId(),codeClassifyTemplateAttrDO.getName()});
 			}
 			//濡傛灉鏄粍鍚堣鍒欙紝閲岄潰浣跨敤鐨勫睘鎬т笉鑳界己澶憋紝涔熼兘寰楁樉绀�
-			String componentrule = codeClassifyTemplateAttrDTO.getComponentrule();
+			String componentrule = codeClassifyTemplateAttrDTO.getComponentRule();
 			boolean isContainsDynamicParameter = PatternUtil.isContainsDynamicParameter(componentrule);
 			if(isContainsDynamicParameter){
 				List<String> userdAttrList =  PatternUtil.getKeyListByContent(componentrule);//鍖呭惈鐨勬墍鏈�${xxx}涓殑xxx
@@ -409,7 +409,7 @@
 					}
 					//瑕佺湅鐪嬭〃鍗曟槸鍚︽樉绀�
 					String unFormDisplayAttr = userdAttrList.stream().filter(s -> !VciBaseUtil.getBoolean(attrDTOMap.getOrDefault(s.toLowerCase(Locale.ROOT),
-						new CodeClassifyTemplateAttrDTO()).getFormdisplayflag())).collect(Collectors.joining(","));
+						new CodeClassifyTemplateAttrDTO()).getFormDisplayFlag())).collect(Collectors.joining(","));
 					if(StringUtils.isNotBlank(unFormDisplayAttr)){
 						throw new VciBaseException("{0}灞炴�ф槸缁勫悎瑙勫垯锛屼絾鏄鍒欓噷鍖呭惈鐨勫睘鎬{1}]鍦ㄥ綋鍓嶆ā鏉夸腑娌℃湁璁剧疆 琛ㄥ崟鏄剧ず ",new String[]{codeClassifyTemplateAttrDO.getName(),unFormDisplayAttr});
 					}
@@ -417,7 +417,7 @@
 			}
 
 			if(CLASSIFYTEMPLATEOID==null){
-				CLASSIFYTEMPLATEOID = codeClassifyTemplateAttrDTO.getClassifytemplateoid();
+				CLASSIFYTEMPLATEOID = codeClassifyTemplateAttrDTO.getClassifyTemplateOid();
 			}
 
 		}
@@ -439,7 +439,7 @@
 		}
 //		BatchCBO batchCBOTemplateDelete = new BatchCBO();
 		if(!CollectionUtils.isEmpty(oids)){
-			baseMapper.deleteBatchIds(oids);
+			this.removeBatchByIds(oids);
 		}
 
 		//鍐嶆柊澧�
@@ -542,7 +542,7 @@
 		}
 
 		//鍒ゆ柇浼犺繃鏉ョ殑鍙傜収閰嶇疆鏄惁鏄痡son鏍煎紡
-		if(StringUtils.isNotBlank(codeClassifyTemplateAttrDTO.getReferbtmid())&&!checkKVObj(codeClassifyTemplateAttrDTO.getReferbtmid())){
+		if(StringUtils.isNotBlank(codeClassifyTemplateAttrDTO.getReferBtmId())&&!checkKVObj(codeClassifyTemplateAttrDTO.getReferBtmId())){
 			throw new VciBaseException("鏋氫妇娉ㄥ叆鏁版嵁鏍煎紡閿欒!");
 		}
 
diff --git a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/MdmIOServiceImpl.java b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/MdmIOServiceImpl.java
index 90a9ab3..931fe88 100644
--- a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/MdmIOServiceImpl.java
+++ b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/MdmIOServiceImpl.java
@@ -54,6 +54,7 @@
 import org.apache.poi.ss.usermodel.Font;
 import org.apache.poi.ss.usermodel.RichTextString;
 import org.apache.poi.ss.usermodel.Workbook;
+import org.springblade.core.cache.utils.CacheUtil;
 import org.springblade.core.redis.cache.BladeRedis;
 import org.springblade.core.tool.api.R;
 import org.springframework.beans.BeanUtils;
@@ -1379,8 +1380,7 @@
 	public List<CodeImportTemplateVO> gridclassifys(String redisOid) {
 		List<CodeImportTemplateVO> codeImportTemplateVOs=new ArrayList<>();
 		VciBaseUtil.alertNotNull(redisOid,"鍒嗙被",redisOid,"鍒嗙被缂撳瓨涓婚敭");
-
-		List<CodeImportTemplateVO> redisServiceCacheObjects=bladeRedis.lRange(redisOid,0,-1);
+		List<CodeImportTemplateVO> redisServiceCacheObjects=bladeRedis.get(redisOid);
 		if(redisServiceCacheObjects!=null){
 			codeImportTemplateVOs=  redisServiceCacheObjects;
 		}
@@ -1396,7 +1396,7 @@
 	@Override
 	public DataGrid<Map<String, String>> gridDatas(String codeClssifyOid, String redisOid) {
 		VciBaseUtil.alertNotNull(redisOid,"瀵煎叆鐩镐技鏁版嵁",redisOid,"鏁版嵁缂撳瓨涓婚敭");
-		List<CodeImprotDataVO> codeImprotDataVOs = bladeRedis.lRange(redisOid+"-"+codeClssifyOid,0,-1);
+		List<CodeImprotDataVO> codeImprotDataVOs = bladeRedis.get(redisOid+"-"+codeClssifyOid);
 //		redisService.getCacheList(redisOid+"-"+codeClssifyOid);
 		CodeImprotDataVO codeImprotDataVO=new CodeImprotDataVO();
 		if(!CollectionUtils.isEmpty(codeImprotDataVOs)){
@@ -1430,7 +1430,7 @@
 	@Override
 	public DataGrid<Map<String,String>> gridRowResemble(String oid,String redisOid){
 		VciBaseUtil.alertNotNull(redisOid,"瀵煎叆鐩镐技鏁版嵁",redisOid,"鏁版嵁缂撳瓨涓婚敭");
-		List<DataResembleVO> codeImprotDataVOs = bladeRedis.lRange(redisOid,0,-1);;
+		List<DataResembleVO> codeImprotDataVOs = bladeRedis.get(redisOid);;
 		DataGrid<Map<String, String>> dataGrid = new DataGrid<>();
 		List<Map<String, String>> dataList = new ArrayList<>();
 

--
Gitblit v1.9.3