bug修改提交

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

@@ -33,12 +33,11 @@
        </el-button>
      </template>
      <template slot-scope="scope" slot="menu">
        <el-button
        <el-button v-if="permissionList.settingBtn"
          type="text"
          icon="el-icon-setting"
          size="small"
          @click.stop="handleRowClick(scope.row)"
          v-if="userInfo.role_name.includes('admin')"
        >字典配置
        </el-button>
      </template>
@@ -79,7 +78,7 @@
            type="danger"
            size="small"
            icon="el-icon-delete"
            v-if="permission.dict_delete"
            v-if="permissionList.delBtn"
            plain
            @click="handleDelete"
          >删 除
@@ -91,7 +90,7 @@
            icon="el-icon-circle-plus-outline"
            size="small"
            @click.stop="handleAdd(scope.row,scope.index)"
            v-if="userInfo.role_name.includes('admin')"
            v-if="permissionList.addChildBtn"
          >新增子项
          </el-button>
        </template>
@@ -150,10 +149,12 @@
    ...mapGetters(["userInfo", "permission"]),
    permissionList() {
      return {
        addBtn: this.vaildData(this.permission.dict_add, false),
        delBtn: this.vaildData(this.permission.dict_delete, false),
        editBtn: this.vaildData(this.permission.dict_edit, false),
        viewBtn: false,
        addBtn: this.vaildData(this.permission.dict.dict_add, false),
        delBtn: this.vaildData(this.permission.dict.dict_delete, false),
        editBtn: this.vaildData(this.permission.dict.dict_edit, false),
        viewBtn: this.vaildData(this.permission.dict.dict_view, false),
        settingBtn: this.vaildData(this.permission.dict.dict_config,false),
        addChildBtn: this.vaildData(this.permission.dict.dict_add_child,false),
      };
    },
    ids() {

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

@@ -26,7 +26,7 @@
          type="danger"
          size="small"
          icon="el-icon-delete"
          v-if="permission.dictbiz_delete"
          v-if="permissionList.dictbiz_delete"
          plain
          @click="handleDelete"
        >删 除
@@ -38,7 +38,7 @@
          icon="el-icon-setting"
          size="small"
          @click.stop="handleRowClick(scope.row)"
          v-if="userInfo.role_name.includes('admin')"
          v-if="permissionList.settingBtn"
        >字典配置
        </el-button>
      </template>
@@ -78,7 +78,7 @@
            type="danger"
            size="small"
            icon="el-icon-delete"
            v-if="permission.dict_delete"
            v-if="permissionList.delBtn"
            plain
            @click="handleDelete"
          >删 除
@@ -90,7 +90,7 @@
            icon="el-icon-circle-plus-outline"
            size="small"
            @click.stop="handleAdd(scope.row,scope.index)"
            v-if="userInfo.role_name.includes('admin')"
            v-if="permissionList.addChildBtn"
          >新增子项
          </el-button>
        </template>
@@ -149,10 +149,12 @@
      ...mapGetters(["userInfo", "permission"]),
      permissionList() {
        return {
          addBtn: this.vaildData(this.permission.dictbiz_add, false),
          delBtn: this.vaildData(this.permission.dictbiz_delete, false),
          editBtn: this.vaildData(this.permission.dictbiz_edit, false),
          viewBtn: false,
          addBtn: this.vaildData(this.permission.dictbiz.dictbiz_add, false),
          delBtn: this.vaildData(this.permission.dictbiz.dictbiz_delete, false),
          editBtn: this.vaildData(this.permission.dictbiz.dictbiz_edit, false),
          viewBtn: this.vaildData(this.permission.dictbiz.dictbiz_view, false),
          settingBtn: this.vaildData(this.permission.dictbiz.dictbiz_config, false),
          addChildBtn: this.vaildData(this.permission.dictbiz.dictbiz_add_child,false),
        };
      },
      ids() {

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

@@ -6,10 +6,10 @@
               :permission="permissionList"
               :page.sync="page">
      <template slot="menuLeft">
        <el-button type="danger"
        <el-button v-if="permissionList.delBtn"
          type="danger"
                   size="small"
                   icon="el-icon-delete"
                   v-if="permission.param_delete"
                   plain
                   @click="handleDelete">删 除
        </el-button>
@@ -27,10 +27,10 @@
  computed: {
    permissionList() {
      return {
        addBtn: this.vaildData(this.permission.param_add, false),
        viewBtn: this.vaildData(this.permission.param_view, false),
        delBtn: this.vaildData(this.permission.param_delete, false),
        editBtn: this.vaildData(this.permission.param_edit, false)
        addBtn: this.vaildData(this.permission.param.param_add, false),
        viewBtn: this.vaildData(this.permission.param.param_view, false),
        delBtn: this.vaildData(this.permission.param.param_delete, false),
        editBtn: this.vaildData(this.permission.param.param_edit, false)
      };
    }
  },

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

@@ -596,7 +596,7 @@
            .last("limit 1");
        CodeBasicSec lastCodeBasicSec = codeBasicSecMapper.selectOne(lastBasicWrapper);
        // 排序号从这儿开始排
        int orderNum = Func.isEmpty(lastCodeBasicSec.getOrderNum()) ? 0:lastCodeBasicSec.getOrderNum();
        int orderNum = Func.isEmpty(lastCodeBasicSec) || Func.isEmpty(lastCodeBasicSec.getOrderNum()) ? -1 : lastCodeBasicSec.getOrderNum();
        if(basicSecDOS.isEmpty()){
            return R.fail("克隆的码段信息不存在！");
        }

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

@@ -788,7 +788,7 @@
        String uuid=VciBaseUtil.getPk();
        boolean isCreateUUid=false;
        boolean isExport=false;
        long start = System.currentTimeMillis();
        //long start = System.currentTimeMillis();
        for(int i=0;i<sheetDataSetList.size()-1;i++) {
            if (CollectionUtils.isEmpty(sheetDataSetList) || CollectionUtils.isEmpty(sheetDataSetList.get(i).getRowData())
                || sheetDataSetList.get(i).getRowData().size() < 1) {
@@ -1058,7 +1058,7 @@
                engineService.batchSaveSelectChar(templateVO, dataCBOIdList);
            }
        }
        long end = System.currentTimeMillis();
        //long end = System.currentTimeMillis();
        //log.info("=============for执行时间================="+String.valueOf((end-start)/1000));
        String excelFileName="";
        if(isExport&&!CollectionUtils.isEmpty(shetNameMap)) {