From c48424facd0ecfb470766da232cc209d666fdd3e Mon Sep 17 00:00:00 2001
From: yuxc <653031404@qq.com>
Date: 星期四, 21 九月 2023 11:36:32 +0800
Subject: [PATCH] 1、修改分类授权查询树的接口。 2、修改分类授权保存接口。
---
Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/CodeApplyWebManagementServiceImpl.java | 25 +++++++++++++++++--------
Source/UBCS/ubcs-service/ubcs-code/src/main/resources/mapper/SystemClassifyRoleMapper.xml | 2 +-
Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/controller/CodeApplyWebManagementController.java | 1 +
3 files changed, 19 insertions(+), 9 deletions(-)
diff --git a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/controller/CodeApplyWebManagementController.java b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/controller/CodeApplyWebManagementController.java
index 046eac1..21edf3b 100644
--- a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/controller/CodeApplyWebManagementController.java
+++ b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/controller/CodeApplyWebManagementController.java
@@ -55,6 +55,7 @@
@PostMapping( "/batchAddSave")
public R batchAddSave(@RequestBody List<SystemClassifyRole> list,String systemOid,String systemId){
return codeApplyWebManagementService.batchAddSave(list,systemOid,systemId);
+// return R.success("dddd");
}
@GetMapping("/getSystemClassifyRoleTree")
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 fd899e0..ca874f0 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
@@ -17,9 +17,11 @@
import org.springframework.stereotype.Service;
import javax.annotation.Resource;
+import java.util.ArrayList;
import java.util.Date;
import java.util.Iterator;
import java.util.List;
+import java.util.stream.Collectors;
@Service
public class CodeApplyWebManagementServiceImpl extends ServiceImpl<SystemClassifyRoleMapper, SystemClassifyRole> implements ICodeApplyWebManagementService {
@@ -45,24 +47,31 @@
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()));;
this.remove(wrapper);
+ List<SystemClassifyRole> newSCRoles = new ArrayList<>();
//鏁版嵁澶勭悊
+ systemClassifyRoles.stream().forEach(classifyRole ->{
+ classifyRole.setCreator(String.valueOf(AuthUtil.getUser().getUserId()));
+ classifyRole.setCreateTime(new Date());
+ classifyRole.setLastModifier(String.valueOf(AuthUtil.getUser().getUserId()));
+ classifyRole.setLastModifyTime(new Date());
+ classifyRole.setTs(new Date());
+ });
+ newSCRoles.addAll(systemClassifyRoles);
+ //澶勭悊鏂伴�夋嫨鐨勬暟鎹�
roleList.stream().forEach(systemClassifyRole -> {
if(StringUtil.isBlank(systemClassifyRole.getOid())){
DefaultAttrAssimtUtil.addDefaultAttrAssimt(systemClassifyRole,"systemClassifyRole");
systemClassifyRole.setSystemId(systemId);
systemClassifyRole.setSystemOid(systemOid);
- }else{
- systemClassifyRole.setCreator(String.valueOf(AuthUtil.getUser().getUserId()));
- systemClassifyRole.setCreateTime(new Date());
- systemClassifyRole.setLastModifier(String.valueOf(AuthUtil.getUser().getUserId()));
- systemClassifyRole.setLastModifyTime(new Date());
- systemClassifyRole.setTs(new Date());
+ systemClassifyRole.setTenantId(AuthUtil.getTenantId());
+ systemClassifyRole.setSelected(true);
+ newSCRoles.add(systemClassifyRole);
}
- systemClassifyRole.setTenantId(AuthUtil.getTenantId());
});
//淇濆瓨
- this.saveBatch(roleList);
+ this.saveBatch(newSCRoles);
return R.success("鎿嶄綔鎴愬姛");
}
diff --git a/Source/UBCS/ubcs-service/ubcs-code/src/main/resources/mapper/SystemClassifyRoleMapper.xml b/Source/UBCS/ubcs-service/ubcs-code/src/main/resources/mapper/SystemClassifyRoleMapper.xml
index d21813b..8c7470e 100644
--- a/Source/UBCS/ubcs-service/ubcs-code/src/main/resources/mapper/SystemClassifyRoleMapper.xml
+++ b/Source/UBCS/ubcs-service/ubcs-code/src/main/resources/mapper/SystemClassifyRoleMapper.xml
@@ -70,7 +70,7 @@
pc.SYSTEMID,
p.oid CLASSIFYOID,
p.id CLASSIFYID,
- case when pc.selected is null then 'false' else pc.SELECTED end SELECTED,
+ case when pc.selected is null then false else pc.SELECTED end SELECTED,
p.PARENTCODECLASSIFYOID CLASSPARENTOID
from PL_CODE_CLASSIFY p ,
PL_CODE_SYSTEM_CLASSIFY_ROLE pc
--
Gitblit v1.9.3