Merge remote-tracking branch 'origin/master'

 Source/UBCS-WEB/src/views/system/user.vue

@@ -396,6 +396,7 @@
      userflag:true,
      usernumber:0,
      userStatus:false,
      isUpdateShowInput:false,
    };
  },
  watch: {
@@ -558,6 +559,7 @@
                    message: "请输入登录账号",
                    trigger: "blur"
                  }],
                  disabled: this.isUpdateShowInput,
                },
                {
                  label: "用户平台",
@@ -711,7 +713,7 @@
                  multiple: true,
                  type: "tree",
                  dicData: [],
                  disabled:this.userStatus,
                  disabled: this.isUpdateShowInput,
                  props: {
                    label: "title"
                  },
@@ -1100,9 +1102,9 @@
    beforeOpen(done, type) {
      // console.log(type)
      if(type === "edit"){
        this.userStatus = true;
        this.isUpdateShowInput = true;
      }else {
        this.userStatus = false;
        this.isUpdateShowInput = false;
      }
      //console.log(type)
      // console.log('this.tenantId',this.tenantId)

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

@@ -199,9 +199,9 @@
    private SaveLogUtil saveLogUtil;

    /**
     * 导出的十万条
     * 客户现场excel为老版本，导出的总数限制为65535
     */
    public static final int EXPORT_LIMIT = 100000;
    public static final int EXPORT_LIMIT = 65535;

    /**
     * 批量申请：选取选中分类下的所有模板关键属性，相似属性，必填属性，写入execl中
@@ -382,7 +382,7 @@
        CodeClassifyVO codeClassifyVO = classifyService.getObjectByOid(codeClassifyOid);

        //获取码段宽度
        //String secWidth = getCodeSegmentWidth(codeClassifyVO.getOid());
        String secWidth = getCodeSegmentWidth(codeClassifyVO.getOid());

        if(isHistory){
            templateVOList= templateService.childTemplates(codeClassifyOid);
@@ -612,6 +612,7 @@
        ExcelUtil.writeDataToFile(excelName,eo);
        return excelName;
    }

    /**
     * 获取码段宽度
     * @param codeClassifyOid
@@ -1274,6 +1275,7 @@
            throw e;
        }
    }

    /**
     * 导入批量编辑数据
     *
@@ -1836,10 +1838,10 @@
            tableName = VciBaseUtil.getTableName(btmTypeId);
        }

        String countSql = "select count(*) from " + tableName +" where 1=1" +
        String countSql = "select count(*) from (select * FROM " + tableName +" where 1=1" +
            " and lastr = '1'" +
            " and lastv='1'" +
            " and codeclsfpath like '%" + exportAttrDTO.getCodeClassifyOid() + "%'";
            " and codeclsfpath like '%" + exportAttrDTO.getCodeClassifyOid() + "%' {}";

        //先查询总数
        int total = 0;
@@ -1853,8 +1855,7 @@
                thisPage.setSort(exportAttrDTO.getSort());
                thisPage.setOrder(exportAttrDTO.getOrder());
                thisPage.addDefaultDesc("createTime");

                total += commonsMapper.queryCountBySql(countSql);
                total += commonsMapper.queryCountBySql(StringUtil.format(countSql," limit " + exportAttrDTO.getLimit() +" offset "+ i +")subquery;"));
            }
        }else{
            total = commonsMapper.queryCountBySql(countSql);