Merge remote-tracking branch 'origin/master'

 Source/UBCS-WEB/src/components/FormTemplate/FormTemplate.vue

@@ -135,8 +135,15 @@
      let group = [];
      let dictKeys = [];
      let slotColumnList = [];
      let value=''
      formItemList.forEach((formItem) => {
        formItem = this.resetFormConfig(formItem);
        if( formItem.type === "combox" && formItem.dicData){
          value=formItem.dicData[0].key
        }
        // console.log('formItem',formItem)
        // console.log('formItem.dicData[0].value',formItem.dicData[0].key)
        // console.log('formItem.dicData[0].value',formItem.dicData[0].id)
        if (formItem.type === "line") {
          group.push({
            label: formItem.text,
@@ -189,13 +196,14 @@
          append: this.preOrSufFixShow("text", formItem.suffix),
          prefixIcon: this.preOrSufFixShow("icon", formItem.prefix),
          suffixIcon: this.preOrSufFixShow("icon", formItem.suffix),
          valueFormat: formItem.dateFormate,
          valueFormat:formItem.dateFormate,
          format: formItem.dateFormate,
          keyAttr: formItem.keyAttr,
          value: formItem.defaultValue,
          value: value,
          placeholder: formItem.inputTip,
          comboxKey: formItem.comboxKey,
          tip: formItem.tooltips,
          readonly:true,
          display: !formItem.hidden,
          maxlength: formItem.maxlength,
          filterable: true,
@@ -206,7 +214,6 @@
                  showField: formItem.showField || formItem.field,
                  field: formItem.field,
                  fieldMap:formItem.fieldMap || {fieldMapKey:'id'},

                  placeholder: formItem.inputTip,
                  options: formItem.referConfig
                }
@@ -234,6 +241,10 @@
            value: "key",
          },
        };
        // if(columnItem.type == "select"){
        //   columnItem.value=value
        // }
        // console.log('columnItem',columnItem)
        slotColumnList.push(columnItem);
        if (group.length === 0) {
          column.push(columnItem);
@@ -251,6 +262,7 @@

      this.geDictData(dictKeys);
      this.getFormDetail();

    },
    // 使用传入的表单数据配置
    resetFormConfig(formItem) {

 Source/UBCS-WEB/src/components/FormTemplate/index.vue

@@ -244,7 +244,7 @@
            } else {
              this.showResembleQuery = false;
            }
            console.log(this.hasResemble, "this.hasResemblethis.hasResemble");
            // console.log(this.hasResemble, "this.hasResemblethis.hasResemble");
            this.$nextTick(() => {
              this.$refs.FormTemplate.templateRender(
                res.data.formDefineVO.items
@@ -277,6 +277,8 @@
            "codeattrsec",
            //日期码段
            "codedatesec",
            //层级码段
            "codelevelsec",
          ];
          this.secVOList = (res.data.data.secVOList || []).filter((item) =>
            typeList.includes(item.secType)
@@ -291,8 +293,8 @@
            this.showCodeApply = false;
          }
        }
        console.log(' this.secVOList',this.secVOList)
        console.log(' res.data.data.secVOList',res.data.data.secVOList)
        // console.log(' this.secVOList',this.secVOList)
        // console.log(' res.data.data.secVOList',res.data.data.secVOList)
      });
    },
    getFormData(form) {

 Source/UBCS-WEB/src/components/MasterCrud/VciMasterCrud.vue

@@ -47,6 +47,7 @@
                               :prop="item.prop" :show-overflow-tooltip="true"
                               :sortable="item.sortable"
                               :width="item.width"
                               v-if="item.tableDisplayFlag == 'true'"
                               align="center">
              </el-table-column>
            </el-table>

 Source/UBCS-WEB/src/views/code/code.vue

@@ -1402,7 +1402,7 @@
    </el-dialog>
  </basic-container>
</template>
 

<script>
import {
  gridCodeRule,
@@ -3660,7 +3660,7 @@
  },
};
</script>
 

<style>
[class^="icon-"] {
  font-size: 12px !important;
@@ -3803,4 +3803,4 @@
/* .code-total > .basic-container__card {
    height: 100%;
  } */
</style>
</style>

 Source/UBCS-WEB/src/views/docking/loge.vue

@@ -54,7 +54,7 @@
            prop: "id",
            search: true,
            sortable:true,
            width:150
            width:130
          },
          {
            label: "图号",
@@ -69,7 +69,8 @@
            prop: 'classifyId',
            search: true,
            sortable:true,
            width: 230
            overHidden:true,
            width: 150
          },
          {
            label: '分类名称',
@@ -77,14 +78,14 @@
            search: true,
            sortable:true,
            overHidden: true,
            width: 150
            width: 140
          },
          {
            label: '集成系统编号',
            prop: 'systemCode',
            search: true,
            sortable:true,
            width: 150
            width: 130
          },
          {
            label: '集成系统名称',

 Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/mapper/CodeClassifyMapper.java

@@ -41,7 +41,7 @@
     * @param plCodeClassify
     * @return
     */
    List<CodeClassifyVO> selectPlCodeClassifyPage(IPage page, CodeClassifyVO plCodeClassify);
    List<CodeClassifyVO> selectPlCodeClassifyPage(IPage page, CodeClassifyVO plCodeClassify,@Param("tenantId") String tenantId);

    /**
     * 查找子类

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

@@ -45,6 +45,7 @@
import com.vci.ubcs.starter.web.util.BeanUtilForVCI;
import com.vci.ubcs.starter.web.util.LangBaseUtil;
import com.vci.ubcs.starter.web.util.VciBaseUtil;
import com.vci.ubcs.system.cache.NacosConfigCache;
import org.apache.poi.hssf.util.HSSFColor;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -84,8 +85,8 @@
    @Resource
    private IBtmTypeClient btmTypeClient;

    @Value("${user-info.tenant-id}")
    private String tenantId;
    @Resource
    private NacosConfigCache nacosConfigCache;

    /**
     * 日志
@@ -126,7 +127,12 @@

    @Override
    public IPage<CodeClassifyVO> selectPlCodeClassifyPage(IPage<CodeClassifyVO> page, CodeClassifyVO plCodeClassify) {
        return page.setRecords(codeClassifyMapper.selectPlCodeClassifyPage(page, plCodeClassify));
        return page.setRecords(codeClassifyMapper.selectPlCodeClassifyPage(page, plCodeClassify,AuthUtil.getTenantId()
            .equals(
                nacosConfigCache
                    .getAdminUserInfo()
                    .getTenantId()
            ) ? null:AuthUtil.getTenantId()));
    }

    /**
@@ -518,9 +524,19 @@
        }
        if(StringUtils.isNotBlank(id) || StringUtils.isNotBlank(lcStatus) ){
            doList = codeClassifyMapper
                .selectCodeClassifyDOByTree(treeQueryObject.getConditionMap().get("id"),treeQueryObject.getConditionMap().get("lcStatus"),treeQueryObject.getParentOid(), AuthUtil.getTenantId().equals(this.tenantId) ? "":AuthUtil.getTenantId());
                .selectCodeClassifyDOByTree(treeQueryObject.getConditionMap().get("id"),treeQueryObject.getConditionMap().get("lcStatus"),treeQueryObject.getParentOid(), AuthUtil.getTenantId()
                    .equals(
                        nacosConfigCache
                            .getAdminUserInfo()
                            .getTenantId()
                    ) ? null:AuthUtil.getTenantId());
        }else{
            doList =codeClassifyMapper.selectCodeClassifyVOByTree(treeQueryObject.getParentOid(), AuthUtil.getTenantId().equals(this.tenantId) ? "":AuthUtil.getTenantId());
            doList =codeClassifyMapper.selectCodeClassifyVOByTree(treeQueryObject.getParentOid(), AuthUtil.getTenantId()
                .equals(
                    nacosConfigCache
                        .getAdminUserInfo()
                        .getTenantId()
                ) ? null:AuthUtil.getTenantId());
        }
        List<CodeClassifyVO> voList = codeClassifyDO2VOs(doList);
        TreeWrapperOptions treeWrapperOptions = new TreeWrapperOptions(PARENT_FIELD_NAME);

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

@@ -951,7 +951,7 @@
            return (BaseModel) valueWrapper.get();
        } catch (Exception e) {
            logger.error("创建业务类型对象", e);
            throw new VciBaseException("initBtmError", new String[]{btmName});
            throw new ServiceException("initBtmError:"+"业务类型："+btmName+":"+e.getMessage());
        }
    }


 Source/UBCS/ubcs-service/ubcs-code/src/main/resources/mapper/CodeCLassifyMapper.xml

@@ -46,6 +46,9 @@

    <select id="selectPlCodeClassifyPage" resultMap="plCodeClassifyResultMap">
        select * from PL_CODE_CLASSIFY where is_deleted = 0
        <if test="tenantId != null and tenantId != ''">
            and tenant_id = #{tenantId}
        </if>
    </select>

    <select id="selectAllLevelChildOid" resultType="java.util.HashMap">
@@ -362,7 +365,7 @@
        </if>

        <if test="tenantId != null and tenantId != ''">
            codeclassify0.tenant_id = #{tenantId}
            and codeclassify0.tenant_id = #{tenantId}
        </if>
        order by id asc
    </select>