From 1f0a10ab714699acc85430b90bcb5a1eeaad1eec Mon Sep 17 00:00:00 2001
From: xiejun <xj@2023>
Date: 星期一, 17 七月 2023 10:14:45 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/CodeRuleServiceImpl.java | 22 +++++++++++++---------
1 files changed, 13 insertions(+), 9 deletions(-)
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 6c67106..8bd5db7 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
@@ -17,6 +17,7 @@
package com.vci.ubcs.code.service.impl;
import com.alibaba.cloud.commons.lang.StringUtils;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
@@ -203,6 +204,9 @@
//灏咲TO杞崲涓篋O
CodeRule codeRule = selectByOid(codeRuleDTO.getOid());
revisionModelUtil.copyFromDTOIgnore(codeRuleDTO, codeRule);
+ if(!codeRule.getOwner().equals(codeRuleDTO.getOwner())){
+ codeRule.setOwner(codeRuleDTO.getOwner());
+ }
DefaultAttrAssimtUtil.updateDefaultAttrAssimt(codeRule);
return R.status(codeRuleMapper.updateById(codeRule)>0);
}
@@ -495,12 +499,14 @@
*/
@Override
public R checkLikeCodeRule(String oid) throws VciBaseException {
- CodeRuleVO codeRuleVO = getObjectByOid(oid);
- // 1銆佸幓鎺夋祦姘寸爜娈碉紝璁＄畻鍑哄叾浠栫爜娈靛�奸暱搴︼紝鍦ㄥ凡鍙戝竷鐨勮鍒欎腑姣斿鍑洪暱搴︿竴鑷寸殑缂栫爜瑙勫垯
- HashMap<String, Object> condtionMap = new HashMap<>();
- condtionMap.put("pkCodeRule_equal",codeRuleVO.getOid());
- condtionMap.put("secType_notequal", CodeSecTypeEnum.CODE_SERIAL_SEC);
- codeRuleVO.setSecVOList(codeBasicSecService.listCodeBasicSecByRuleOid(condtionMap));
+ // 1銆佹煡璇㈠嚭褰撳墠瑕佸彂甯冪殑瑙勫垯
+ CodeRuleVO codeRuleVO = getObjectHasSecByOid(oid);
+ // 2銆佹壘鍑轰笌褰撳墠鍙戝竷鐨勮鍒欑爜娈甸『搴忎竴鑷寸殑瑙勫垯
+ if(Func.isNotEmpty(codeRuleVO.getSecVOList())){
+ String secType = codeRuleVO.getSecVOList().stream().map(CodeBasicSecVO::getSecType).collect(Collectors.joining(","));
+
+ }
+
// TODO 寰呭畬鍠�
@@ -552,9 +558,7 @@
//濡傛灉鏈塴cstatus鐨勭被鐨勮瘽
vo.setLcStatusText(CodeRuleLC.getTextByValue(vo.getLcStatus()));
if (hasSec) {
- Map<String, Object> condtionMap = new HashMap<>();
- condtionMap.put("pkCodeRule",vo.getOid());
- List<CodeBasicSecVO> codeBasicSecVOS = codeBasicSecService.listCodeBasicSecByRuleOid(condtionMap);
+ List<CodeBasicSecVO> codeBasicSecVOS = codeBasicSecService.listCodeBasicSecByRuleOid(vo.getOid());
//鏌ヨ鐮佹
vo.setSecVOList(codeBasicSecVOS);
}
--
Gitblit v1.9.3