From 41aacf110288329a6beb494ccccaeabd217a08b9 Mon Sep 17 00:00:00 2001
From: 田源 <lastanimals@163.com>
Date: 星期二, 05 十二月 2023 18:05:46 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/CodeApplyWebManagementServiceImpl.java | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/CodeApplyWebManagementServiceImpl.java b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/CodeApplyWebManagementServiceImpl.java
index f43d83a..5bab4a3 100644
--- a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/CodeApplyWebManagementServiceImpl.java
+++ b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/CodeApplyWebManagementServiceImpl.java
@@ -48,7 +48,7 @@
QueryWrapper<SystemClassifyRole> wrapper = new QueryWrapper<>();
wrapper.eq("systemOid",systemOid);
wrapper.eq("systemId",systemId);
- List<SystemClassifyRole> systemClassifyRoles = this.listByIds(roleList.stream().map(SystemClassifyRole ::getOid).collect(Collectors.toList()));;
+ List<SystemClassifyRole> systemClassifyRoles = this.listByIds(roleList.stream().map(SystemClassifyRole ::getOid).collect(Collectors.toList()));
this.remove(wrapper);
List<SystemClassifyRole> newSCRoles = new ArrayList<>();
//鏁版嵁澶勭悊
@@ -63,7 +63,7 @@
//澶勭悊鏂伴�夋嫨鐨勬暟鎹�
roleList.stream().forEach(systemClassifyRole -> {
if(StringUtil.isBlank(systemClassifyRole.getOid())){
- DefaultAttrAssimtUtil.addDefaultAttrAssimt(systemClassifyRole,"systemClassifyRole");
+ DefaultAttrAssimtUtil.addDefaultAttrAssimt(systemClassifyRole,"systemClassifyRole",null);
systemClassifyRole.setSystemId(systemId);
systemClassifyRole.setSystemOid(systemOid);
systemClassifyRole.setTenantId(AuthUtil.getTenantId());
--
Gitblit v1.9.3