Merge remote-tracking branch 'origin/master'

 Source/UBCS-WEB/src/components/Master/MasterTransfer.vue

@@ -135,14 +135,7 @@
          exportCode({codeClassifyOid:this.codeClassifyOid,'conditionMap[oid]':ids,...exportArr}).then(res=>{
            // console.log('res',res)
            if(res){
              const fileNames = res.headers['content-disposition'].split(";");
              let characterSet = fileNames[2].split("filename*=")[1];
              let fileName = decodeURI(fileNames[1].split("filename=")[1],characterSet);  // 下载的文件名
              let blob = new Blob([res.data], {
                type: res.data.type + ";charset=utf-8",
              });
              func.downloadFileByBlob(blob,fileName);
              window.URL.revokeObjectURL(src); //释放掉blob对象
              func.downloadFileByBlob(res);
            }
          })


 Source/UBCS-WEB/src/components/file/main.vue

@@ -395,14 +395,7 @@
      download(data).then(res=>{
        // console.log(res);
        if(res){
          const fileNames = res.headers['content-disposition'].split(";");
          let characterSet = fileNames[2].split("filename*=")[1];
          let fileName = decodeURI(fileNames[1].split("filename=")[1],characterSet);  // 下载的文件名
          let blob = new Blob([res.data], {
            type: res.data.type + ";charset=utf-8",
          });
          func.downloadFileByBlob(blob,fileName);
          window.URL.revokeObjectURL(src); //释放掉blob对象
          func.downloadFileByBlob(res);
        }
      });
    },

 Source/UBCS-WEB/src/util/func.js

@@ -115,13 +115,20 @@
   * @param value
   * @returns {Boolean}
   */
  static downloadFileByBlob(blobData, name) {
    const url = URL.createObjectURL(blobData); // 生成下载链接
  static downloadFileByBlob(res) {
    const fileNames = res.headers['content-disposition'].split(";");
    let characterSet = fileNames[2].split("filename*=")[1];
    let fileName = decodeURI(fileNames[1].split("filename=")[1],characterSet);  // 下载的文件名
    let blob = new Blob([res.data], {
      type: res.data.type + ";charset=utf-8",
    });
    const url = URL.createObjectURL(blob); // 生成下载链接
    const link = document.createElement("a");
    link.href = url;
    link.download = name; // 指定文件名和格式
    link.download = fileName; // 指定文件名和格式
    document.body.appendChild(link); // 添加下载链接到页面
    link.click(); // 触发下载
    document.body.removeChild(link); //删除下载
    window.URL.revokeObjectURL(url); //释放掉blob对象
  }
}

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

@@ -853,6 +853,7 @@
        if(pageHelper.getLimit() != -1){
            query.setSize(pageHelper.getLimit());
            query.setCurrent(pageHelper.getPage());
            query.setDescs("versionValue");
        }

//        List<CodeClstemplateVO> doList = codeClstemplateMapper.selectPlCodeClstemplatePage(Condition.getPage(query), codeClstemplateVO);