From 0c70227fc2ace5da24f27515574981310643c4be Mon Sep 17 00:00:00 2001
From: ludc
Date: 星期四, 26 十月 2023 18:24:08 +0800
Subject: [PATCH] bug修改提交
---
Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/CodeBasicSecServiceImpl.java | 2
Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/MdmIOServiceImpl.java | 6 +-
Source/UBCS-WEB/src/views/system/dict.vue | 17 ++++----
Source/UBCS-WEB/src/views/system/param.vue | 28 +++++++-------
Source/UBCS-WEB/src/views/system/dictbiz.vue | 18 +++++----
5 files changed, 37 insertions(+), 34 deletions(-)
diff --git a/Source/UBCS-WEB/src/views/system/dict.vue b/Source/UBCS-WEB/src/views/system/dict.vue
index 6c95330..3ee511a 100644
--- a/Source/UBCS-WEB/src/views/system/dict.vue
+++ b/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() {
diff --git a/Source/UBCS-WEB/src/views/system/dictbiz.vue b/Source/UBCS-WEB/src/views/system/dictbiz.vue
index d7772fe..34030af 100644
--- a/Source/UBCS-WEB/src/views/system/dictbiz.vue
+++ b/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() {
diff --git a/Source/UBCS-WEB/src/views/system/param.vue b/Source/UBCS-WEB/src/views/system/param.vue
index c890354..b7247f1 100644
--- a/Source/UBCS-WEB/src/views/system/param.vue
+++ b/Source/UBCS-WEB/src/views/system/param.vue
@@ -1,17 +1,17 @@
<template>
<basic-container>
<avue-crud v-bind="bindVal"
- v-on="onEvent"
- v-model="form"
- :permission="permissionList"
- :page.sync="page">
+ v-on="onEvent"
+ v-model="form"
+ :permission="permissionList"
+ :page.sync="page">
<template slot="menuLeft">
- <el-button type="danger"
- size="small"
- icon="el-icon-delete"
- v-if="permission.param_delete"
- plain
- @click="handleDelete">鍒� 闄�
+ <el-button v-if="permissionList.delBtn"
+ type="danger"
+ size="small"
+ icon="el-icon-delete"
+ plain
+ @click="handleDelete">鍒� 闄�
</el-button>
</template>
</avue-crud>
@@ -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)
};
}
},
diff --git a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/CodeBasicSecServiceImpl.java b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/CodeBasicSecServiceImpl.java
index cb8321f..e8eb9d3 100644
--- a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/CodeBasicSecServiceImpl.java
+++ b/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("鍏嬮殕鐨勭爜娈典俊鎭笉瀛樺湪锛�");
}
diff --git a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/MdmIOServiceImpl.java b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/MdmIOServiceImpl.java
index 543b0a5..6e16aa2 100644
--- a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/MdmIOServiceImpl.java
+++ b/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) {
@@ -816,7 +816,7 @@
//鎵剧涓�琛岋紝涓轰簡鎵炬爣棰�
CodeClassifyTemplateVO templateVO = new CodeClassifyTemplateVO();
/** if (!templateService.checkChildHasSameTemplate(classifyFullInfo.getCurrentClassifyVO().getOid())) {
- throw new VciBaseException("褰撳墠鐨勫垎绫讳互鍙婁笅绾у垎绫荤殑妯℃澘涓嶇浉鍚�");
+ throw new VciBaseException("褰撳墠鐨勫垎绫讳互鍙婁笅绾у垎绫荤殑妯℃澘涓嶇浉鍚�");
}***/
//閮借浆鎹㈠畬浜嗐�傞渶瑕佹壒閲忔鏌�
//鎵炬墍鏈夌殑鍒嗙被璺緞,闇�瑕佹牎楠岃矾寰勬槸鍚︽纭紝鏄惁閮藉湪褰撳墠鐨勫垎绫荤殑涓嬬骇
@@ -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)) {
--
Gitblit v1.9.3