From 1f4e7d0f73a73e7350cf5a1df279d5f30904c5d5 Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期三, 06 十二月 2023 08:41:32 +0800
Subject: [PATCH] bug
---
server/src/main/java/doumeemes/biz/system/impl/SystemRoleBizImpl.java | 20 +++++++++++++++-----
1 files changed, 15 insertions(+), 5 deletions(-)
diff --git a/server/src/main/java/doumeemes/biz/system/impl/SystemRoleBizImpl.java b/server/src/main/java/doumeemes/biz/system/impl/SystemRoleBizImpl.java
index df50d3f..5060dbf 100644
--- a/server/src/main/java/doumeemes/biz/system/impl/SystemRoleBizImpl.java
+++ b/server/src/main/java/doumeemes/biz/system/impl/SystemRoleBizImpl.java
@@ -6,12 +6,10 @@
import doumeemes.core.model.LoginUserInfo;
import doumeemes.core.utils.Constants;
import doumeemes.core.utils.DateUtil;
+import doumeemes.dao.system.SystemRoleMapper;
import doumeemes.dao.system.dto.CreateRoleMenuDTO;
import doumeemes.dao.system.dto.CreateRolePermissionDTO;
-import doumeemes.dao.system.model.SystemDataPermission;
-import doumeemes.dao.system.model.SystemRole;
-import doumeemes.dao.system.model.SystemRoleMenu;
-import doumeemes.dao.system.model.SystemRolePermission;
+import doumeemes.dao.system.model.*;
import doumeemes.service.system.SystemDataPermissionService;
import doumeemes.service.system.SystemRoleMenuService;
import doumeemes.service.system.SystemRolePermissionService;
@@ -22,6 +20,7 @@
import org.springframework.transaction.annotation.Transactional;
import org.springframework.util.CollectionUtils;
+import java.util.ArrayList;
import java.util.Date;
import java.util.List;
@@ -35,6 +34,8 @@
private SystemRolePermissionService systemRolePermissionService;
@Autowired
private SystemDataPermissionService systemDataPermissionService;
+ @Autowired
+ private SystemRoleMapper systemRoleMapper;
@Autowired
private SystemRoleMenuService systemRoleMenuService;
@@ -73,6 +74,8 @@
SystemRole queryDto = new SystemRole();
queryDto.setCode(systemRole.getCode());
queryDto.setDeleted(Boolean.FALSE);
+ queryDto.setCompanyId(systemRole.getCompanyId());
+ queryDto.setType(systemRole.getType());
if(Constants.equalsInteger(user.getType(),Constants.USERTYPE.COM)){
systemRole.setType(Constants.ROLETYPE.com);
queryDto.setCompanyId(systemRole.getCompanyId());
@@ -118,13 +121,20 @@
deleteDto.setCompanyId(user.getCompany().getId());
}
systemRolePermissionService.delete(deleteDto);
+ List<SystemRolePermission> list = new ArrayList<>();
// 鏂板鏂扮殑鏉冮檺
for (Integer permissionId : dto.getPermissionIds()) {
SystemRolePermission newRolePermission = new SystemRolePermission();
newRolePermission.setRoleId(dto.getRoleId());
+ newRolePermission.setCreateTime(new Date());
+ newRolePermission.setDeleted(Boolean.FALSE);
+ newRolePermission.setStatus(Constants.ZERO);
newRolePermission.setPermissionId(permissionId);
- systemRolePermissionService.create(newRolePermission);
+ list.add(newRolePermission);
+// systemRolePermissionService.create(newRolePermission);
}
+ if(list.size()>0)
+ systemRoleMapper.insertRolePermissionBatch(list);
}
@Override
@Transactional
--
Gitblit v1.9.3