From b2302526b15194a7d9efb09ad10e632e3cff7443 Mon Sep 17 00:00:00 2001
From: ludc
Date: 星期五, 05 一月 2024 14:36:10 +0800
Subject: [PATCH] 分类授权增加全选按钮
---
Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/CodeSrchCondConfigServiceImpl.java | 2 +-
Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/CodeShowFieldConfigServiceImpl.java | 7 ++++---
Source/UBCS-WEB/src/components/Theme/ClassifyAuthDialog.vue | 17 +++++++++++++++++
Source/UBCS/ubcs-service-api/ubcs-util-api/src/main/java/com/vci/ubcs/starter/util/DefaultAttrAssimtUtil.java | 1 -
Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/CodeRuleServiceImpl.java | 6 ++++--
Source/UBCS-WEB/src/components/code-dialog-page/cloneRuleDialog.vue | 2 ++
6 files changed, 28 insertions(+), 7 deletions(-)
diff --git a/Source/UBCS-WEB/src/components/Theme/ClassifyAuthDialog.vue b/Source/UBCS-WEB/src/components/Theme/ClassifyAuthDialog.vue
index 429d8f1..afb086d 100644
--- a/Source/UBCS-WEB/src/components/Theme/ClassifyAuthDialog.vue
+++ b/Source/UBCS-WEB/src/components/Theme/ClassifyAuthDialog.vue
@@ -64,6 +64,7 @@
</el-table-column>
</el-table>
<div slot="footer" class="dialog-footer">
+ <el-button type="info" plain @click="selectAllButton">鎸夐挳鍏ㄩ��</el-button>
<el-button class="el-icon-plus" type="success" plain @click="addClassifyAuth"></el-button>
<el-button class="el-icon-minus" type="warning" plain @click="subClassifyAuth"></el-button>
<el-button type="primary" plain @click="submit">鎻� 浜�</el-button>
@@ -189,6 +190,10 @@
},
// 澧炲姞琛�
addClassifyAuth() {
+ if(this.roleList.length<=0){
+ this.$message.warning("褰撳墠绉熸埛涓嶅瓨鍦ㄨ鑹蹭俊鎭紒");
+ return;
+ }
let item = {
roleData: this.roleList[0].id,
classifyItem: this.classifyData.label,
@@ -288,6 +293,18 @@
window.console.log(error);
})
},
+ // 鍏ㄩ�夋寜閽�
+ selectAllButton(){
+ if(this.selectList.length!==1){
+ this.$message.warning("璇峰彧閫夋嫨涓�琛岄渶瑕佸叏閫夌殑鎸夐挳鐨勬暟鎹锛�");
+ return;
+ }
+ this.classifyAuthButton.forEach(item => {
+ //console.log("item",item);
+ Vue.set(this.classifyAuthData[0], item.id, true);
+ });
+ //console.log("this.classifyAuthData",this.classifyAuthData);
+ },
},
};
</script>
diff --git a/Source/UBCS-WEB/src/components/code-dialog-page/cloneRuleDialog.vue b/Source/UBCS-WEB/src/components/code-dialog-page/cloneRuleDialog.vue
index c58274e..521fc88 100644
--- a/Source/UBCS-WEB/src/components/code-dialog-page/cloneRuleDialog.vue
+++ b/Source/UBCS-WEB/src/components/code-dialog-page/cloneRuleDialog.vue
@@ -125,6 +125,7 @@
closeCloneDialog(){
this.$emit('update:visible',false);
this.cloneData = [];
+ this.cloneCodeRuleLoading = false;
},
/** 涓婄Щ涓嬬Щ鍩虹鐮佹*/
async upOrderNum(row) {
@@ -211,6 +212,7 @@
},
(error) => {
window.console.log(error);
+ this.cloneCodeRuleLoading = false;
});
},
diff --git a/Source/UBCS/ubcs-service-api/ubcs-util-api/src/main/java/com/vci/ubcs/starter/util/DefaultAttrAssimtUtil.java b/Source/UBCS/ubcs-service-api/ubcs-util-api/src/main/java/com/vci/ubcs/starter/util/DefaultAttrAssimtUtil.java
index 59caa32..c7adc5e 100644
--- a/Source/UBCS/ubcs-service-api/ubcs-util-api/src/main/java/com/vci/ubcs/starter/util/DefaultAttrAssimtUtil.java
+++ b/Source/UBCS/ubcs-service-api/ubcs-util-api/src/main/java/com/vci/ubcs/starter/util/DefaultAttrAssimtUtil.java
@@ -48,7 +48,6 @@
// 璁剧疆鎵�鏈夎��
baseModel.setOwner(AuthUtil.getUserId().toString());
}
-
baseModel.setVersionSeq(1);
baseModel.setVersionRule("0");
baseModel.setVersionValue("1");
diff --git a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/CodeRuleServiceImpl.java b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/CodeRuleServiceImpl.java
index 6b963c6..6381134 100644
--- a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/CodeRuleServiceImpl.java
+++ b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/CodeRuleServiceImpl.java
@@ -23,6 +23,7 @@
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.baomidou.mybatisplus.extension.toolkit.SqlHelper;
import com.vci.ubcs.code.constant.FrameWorkDefaultValueConstant;
import com.vci.ubcs.code.dto.CodeBasicSecDTO;
@@ -518,9 +519,10 @@
}
VciBaseUtil.alertNotNull(codeRuleDTO, "闇�瑕佹坊鍔犵殑鏁版嵁瀵硅薄");
CodeRule codeRuleDO = new CodeRule();
- DefaultAttrAssimtUtil.addDefaultAttrAssimt(codeRuleDO,MdmBtmTypeConstant.CODE_RULE);
BeanUtilForVCI.copyPropertiesIgnoreCase(codeRuleDTO, codeRuleDO);
- boolean exFlag = codeRuleMapper.insert(codeRuleDO)>0;
+ DefaultAttrAssimtUtil.addDefaultAttrAssimt(codeRuleDO,MdmBtmTypeConstant.CODE_RULE);
+ boolean exFlag = SqlHelper.retBool(codeRuleMapper.insert(codeRuleDO));
+
List<CodeBasicSecDTO> secList = codeRuleDTO.getElements();
List<CodeBasicSec> codeBasicSecs = new ArrayList<>();
List<CodeBasicSec> codeClassifySec = new ArrayList<>();
diff --git a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/CodeShowFieldConfigServiceImpl.java b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/CodeShowFieldConfigServiceImpl.java
index 577f289..6328a12 100644
--- a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/CodeShowFieldConfigServiceImpl.java
+++ b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/CodeShowFieldConfigServiceImpl.java
@@ -3,6 +3,7 @@
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.baomidou.mybatisplus.extension.toolkit.SqlHelper;
import com.vci.ubcs.code.entity.CodeShowFieldConfig;
import com.vci.ubcs.code.mapper.CodeShowFieldConfigMapper;
import com.vci.ubcs.code.service.ICodeShowFieldConfigService;
@@ -34,7 +35,7 @@
*/
@Override
public boolean insert(CodeShowFieldConfig codeShowFieldConfig) {
- return this.codeShowFieldConfigMapper.insert(codeShowFieldConfig)>0;
+ return SqlHelper.retBool(this.codeShowFieldConfigMapper.insert(codeShowFieldConfig));
}
@Override
@@ -59,7 +60,7 @@
*/
@Override
public boolean deleteById(String oid) {
- return this.codeShowFieldConfigMapper.deleteById(oid) > 0;
+ return SqlHelper.retBool(this.codeShowFieldConfigMapper.deleteById(oid));
}
@Override
@@ -67,7 +68,7 @@
LambdaQueryWrapper<CodeShowFieldConfig> lambdaQueryWrapper = Wrappers.<CodeShowFieldConfig>query()
.lambda()
.eq(CodeShowFieldConfig::getReferConfigOid, oid);
- return this.codeShowFieldConfigMapper.delete(lambdaQueryWrapper) > 0;
+ return SqlHelper.retBool(this.codeShowFieldConfigMapper.delete(lambdaQueryWrapper));
}
}
diff --git a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/CodeSrchCondConfigServiceImpl.java b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/CodeSrchCondConfigServiceImpl.java
index 31082d8..96a4691 100644
--- a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/CodeSrchCondConfigServiceImpl.java
+++ b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/CodeSrchCondConfigServiceImpl.java
@@ -34,7 +34,7 @@
*/
@Override
public boolean insert(CodeSrchCondConfig codeSrchcondconfig) {
- return this.codeSrchcondconfigMapper.insert(codeSrchcondconfig)>0;
+ return this.codeSrchcondconfigMapper.insert(codeSrchcondconfig)>0;
}
@Override
--
Gitblit v1.9.3