Merge remote-tracking branch 'origin/master'

 Source/UBCS-WEB/src/components/Theme/ThemeAttrCrud.vue

@@ -388,8 +388,14 @@
        }
      }
    },
    crudArrayFlag:{
      handler(newval,olaval){
        console.log('crudArrayFlag',newval)
      }
    },
    crudArray:{
      handler(newval,oldval){
        console.log('crudArray',newval)
        if(newval != undefined){
          if(newval.length>=1){
            this.crudArrayFlag=true
@@ -1701,22 +1707,29 @@
        if(item.componentRule){
          //组合规则
          num++
          console.log('componentRule',num)
        }
        if(item.enumString || item.enumId){
          //枚举
          num++
          console.log('enumString',num)
        }
        if(item.referConfig || item.referBtmId){
          //参照
          num++
          console.log('referConfig',num)
        }
        if(item.codeDateFormat){
          //时间格式
          num++
          console.log('codeDateFormat',num)
        }
        if(item.classifyInvokeLevel){
        //如果空后台返回none
        if(item.classifyInvokeLevel && item.classifyInvokeLevel != 'none'){
          //分类注入
          num++
          console.log('classifyInvokeLevel',num)
          console.log(item.classifyInvokeLevel)
        }
        if(num>1 && ischeck){
          this.$message({

 Source/UBCS-WEB/src/components/Theme/ThemeClassifyTrees.vue

@@ -427,7 +427,7 @@
          label: '英文名称'
        }
      ],
      SelectValue:"",
      SelectValue:"id",
      SelectFInd:"",
      addFlag:false,
      // 表格当前行id
@@ -672,11 +672,7 @@
    }
  },
  watch:{
    TreeFlagCode:{
      handler(newval,oldval){
        console.log('TreeFlagCode',newval)
      }
    }

  },
  //tab栏默认是表格
  mounted() {
@@ -753,6 +749,8 @@

  },
  methods: {
    // 关闭弹窗

    /** 导入 */
    ImportExcel(){
      this.ThemeImportVisible=true;
@@ -787,15 +785,11 @@
          'conditionMap[id]':this.SelectFInd
        }
        this.MasterdefaultRend(masterParameter);
        this.SelectValue=""
        this.SelectFInd=""
      }else if(this.SelectValue == 'name'){
        const masterParameter={
          'conditionMap[name]':this.SelectFInd
        }
        this.MasterdefaultRend(masterParameter)
        this.SelectValue=""
        this.SelectFInd=""
      }
    },
    //编码规则确定
@@ -846,15 +840,11 @@
          'conditionMap[id]':this.SelectFInd
        }
        this.KeydefaultRend(masterParameter);
        this.SelectValue="";
        this.SelectFInd="";
      }else if(this.SelectValue == 'name'){
        const masterParameter={
          'conditionMap[name]':this.SelectFInd
        }
        this.KeydefaultRend(masterParameter)
        this.SelectValue=""
        this.SelectFInd=""
      }
    },
    //关键属性接口
@@ -899,15 +889,11 @@
          'conditionMap[id]':this.SelectFInd
        }
        this.simdefaultRend(masterParameter);
        this.SelectValue=""
        this.SelectFInd=""
      }else if(this.SelectValue == 'name'){
        const masterParameter={
          'conditionMap[name]':this.SelectFInd
        }
        this.simdefaultRend(masterParameter)
        this.SelectValue=""
        this.SelectFInd=""
      }
    },
    //  相似项多选
@@ -952,15 +938,11 @@
          'conditionMap[id]':this.SelectFInd
        }
        this.btmdefaultRend(masterParameter);
        this.SelectValue=""
        this.SelectFInd=""
      }else if(this.SelectValue == 'name'){
        const masterParameter={
          'conditionMap[name]':this.SelectFInd
        }
        this.btmdefaultRend(masterParameter);
        this.SelectValue="";
        this.SelectFInd="";
      }
    },
    //业务类型多选
@@ -1226,6 +1208,7 @@
      this.editTreeFLagCode = !data.parentId;
      this.nodeClickList = data;
      this.selectRow = 0;
      this.crudArray=[]
      try {
        this.requestCount += 1;
        const [res1, res2, res3] = await Promise.all([
@@ -1444,7 +1427,7 @@
        this.CloneinnerVisible=false
        this.CloneVisible=false
        this.$message.success("复制成功")
        this.CrudRend()
        this.TemRefresh();
        done(row)
      }).catch(res=>{
        done(res)

 Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/MdmEngineServiceImpl.java

@@ -649,11 +649,10 @@
            }
            wrapperKeyAttrConditionMap(value, keyRuleVO, attrId, trim, ignoreCase, ignoreWidth, trimAll, conditionMap);
        });
        conditionMap.put("CODETEMPLATEOID","'" + orderDTO.getTemplateOid() + "'");

        //没有限制分类，但是一个模板只可能在一个业务类型里面，所以直接查询这个业务类型即可

        if (!CollectionUtils.isEmpty(conditionMap)) {
            conditionMap.put("CODETEMPLATEOID","'" + orderDTO.getTemplateOid() + "'");
//            final String[] sql = {"select count(*) from " + VciBaseUtil.getTableName(classifyFullInfo.getTopClassifyVO().getBtmtypeid()) + " t where 1 = 1 "};
            R<List<BtmTypeVO>> listR = btmTypeClient.selectByIdCollection(Collections.singletonList(classifyFullInfo.getTopClassifyVO().getBtmTypeId()));
//                String referTable = VciBaseUtil.getTableName(referVO.getReferType());
@@ -805,10 +804,6 @@
        } else {
            fullPath = classifyFullInfo.getCurrentClassifyVO().getOid();
        }

//        BeanUtils.
//        BeanUtils.copyProperties(orderDTO.getData(),cbo);
//        cbo.setMaterialtype(Short.valueOf("1001"));
        orderDTO.getData().forEach((key, value) -> {
            if (!edit || (!checkUnAttrUnEdit(key) &&
                !VciQueryWrapperForDO.LC_STATUS_FIELD.equalsIgnoreCase(key))) {
@@ -819,9 +814,6 @@
                }
            }
        });
//        BeanMap beanMap = BeanMap.create(cbo);
//        beanMap.putAll(orderDTO.getData());

        try {
            Map<String, String> data = new HashMap<>();
            data.put(cbo.getData().containsKey(CODE_CLASSIFY_OID_FIELD.toUpperCase())?CODE_CLASSIFY_OID_FIELD.toUpperCase():CODE_CLASSIFY_OID_FIELD, classifyFullInfo.getCurrentClassifyVO().getOid());