From c9b02da049f3bfe738c5602c71607aeafd4ed21d Mon Sep 17 00:00:00 2001
From: nidapeng <jp@doumee.com>
Date: 星期五, 15 三月 2024 17:09:54 +0800
Subject: [PATCH] 提交一把
---
server/service/src/main/java/com/doumee/biz/system/impl/SystemMenuBizImpl.java | 2 +-
server/service/src/main/java/com/doumee/dao/system/model/SystemRole.java | 2 ++
server/service/src/main/java/com/doumee/config/shiro/ShiroRealm.java | 2 +-
server/service/src/main/java/com/doumee/dao/system/dto/QuerySystemRoleDTO.java | 2 ++
server/service/src/main/java/com/doumee/service/system/impl/SystemRoleServiceImpl.java | 7 ++++++-
server/shop/src/main/java/com/doumee/api/system/SystemRoleController.java | 2 +-
6 files changed, 13 insertions(+), 4 deletions(-)
diff --git a/server/service/src/main/java/com/doumee/biz/system/impl/SystemMenuBizImpl.java b/server/service/src/main/java/com/doumee/biz/system/impl/SystemMenuBizImpl.java
index 3b5aa86..0089867 100644
--- a/server/service/src/main/java/com/doumee/biz/system/impl/SystemMenuBizImpl.java
+++ b/server/service/src/main/java/com/doumee/biz/system/impl/SystemMenuBizImpl.java
@@ -138,7 +138,7 @@
List<SystemMenu> menus = new ArrayList<SystemMenu>();
List<SystemMenuNodeVO> rootNodes = new ArrayList<>();
menus = systemMenuService.findByUserId(userId,type);
- if(type.equals(Constants.ONE)){
+ if(type.equals(Constants.ONE) || type.equals(Constants.TWO)){
LoginUserInfo loginUserInfo = (LoginUserInfo) SecurityUtils.getSubject().getPrincipal();
Company company = companyService.findById(loginUserInfo.getCompanyId());
if(Objects.isNull(company)){
diff --git a/server/service/src/main/java/com/doumee/config/shiro/ShiroRealm.java b/server/service/src/main/java/com/doumee/config/shiro/ShiroRealm.java
index 13468a3..bcacf86 100644
--- a/server/service/src/main/java/com/doumee/config/shiro/ShiroRealm.java
+++ b/server/service/src/main/java/com/doumee/config/shiro/ShiroRealm.java
@@ -108,7 +108,7 @@
// 鑾峰彇鐧诲綍鐢ㄦ埛淇℃伅
if(authenticationToken.getUserType() == 0){
roles = systemRoleService.findByUserId(user.getId());
- permissions = systemPermissionService.findByUserId(user.getId());
+
CompanyPermission c = new CompanyPermission();
c.setUserId(user.getId());
c.setIsdeleted(Constants.ZERO);
diff --git a/server/service/src/main/java/com/doumee/dao/system/dto/QuerySystemRoleDTO.java b/server/service/src/main/java/com/doumee/dao/system/dto/QuerySystemRoleDTO.java
index 80a1254..8dffa01 100644
--- a/server/service/src/main/java/com/doumee/dao/system/dto/QuerySystemRoleDTO.java
+++ b/server/service/src/main/java/com/doumee/dao/system/dto/QuerySystemRoleDTO.java
@@ -22,5 +22,7 @@
@ApiModelProperty(value = "绫诲瀷 0骞冲彴鐢ㄦ埛 1浼佷笟鐢ㄦ埛")
private Integer type;
+ @ApiModelProperty(value = "浼佷笟缂栫爜")
+ private Integer companyId;
}
diff --git a/server/service/src/main/java/com/doumee/dao/system/model/SystemRole.java b/server/service/src/main/java/com/doumee/dao/system/model/SystemRole.java
index 5b2be1a..c837384 100644
--- a/server/service/src/main/java/com/doumee/dao/system/model/SystemRole.java
+++ b/server/service/src/main/java/com/doumee/dao/system/model/SystemRole.java
@@ -51,6 +51,8 @@
@ApiModelProperty(value = "鍒涘缓鑰匢D", example = "1", hidden = true)
private Integer createUser;
+ @ApiModelProperty(value = "浼佷笟缂栫爜锛堝叧鑱攃ompany)", example = "1", hidden = true)
+ private Integer companyId;
@ApiModelProperty(value = "鏇存柊鑰匢D", example = "1", hidden = true)
private Integer updateUser;
diff --git a/server/service/src/main/java/com/doumee/service/system/impl/SystemRoleServiceImpl.java b/server/service/src/main/java/com/doumee/service/system/impl/SystemRoleServiceImpl.java
index 94318e0..201129c 100644
--- a/server/service/src/main/java/com/doumee/service/system/impl/SystemRoleServiceImpl.java
+++ b/server/service/src/main/java/com/doumee/service/system/impl/SystemRoleServiceImpl.java
@@ -5,6 +5,7 @@
import com.doumee.core.model.LoginUserInfo;
import com.doumee.core.model.PageData;
import com.doumee.core.model.PageWrap;
+import com.doumee.core.utils.Constants;
import com.doumee.core.utils.Utils;
import com.doumee.dao.system.SystemRoleMapper;
import com.doumee.dao.system.dto.QuerySystemRoleDTO;
@@ -43,6 +44,9 @@
@Override
public Integer create(SystemRole systemRole) {
+ LoginUserInfo principal = (LoginUserInfo) SecurityUtils.getSubject().getPrincipal();
+ systemRole.setCompanyId(principal.getCompanyId());
+ systemRole.setType(principal.getType());
systemRoleMapper.insert(systemRole);
return systemRole.getId();
}
@@ -105,7 +109,8 @@
LoginUserInfo principal = (LoginUserInfo) SecurityUtils.getSubject().getPrincipal();
Utils.MP.blankToNull(pageWrap.getModel());
QuerySystemRoleDTO model = pageWrap.getModel();
- model.setType(Objects.nonNull(model.getType()) ? model.getType() : principal.getType());
+ model.setType(Constants.formatIntegerNum(principal.getType()));
+ model.setCompanyId(principal.getCompanyId());
PageHelper.startPage(pageWrap.getPage(), pageWrap.getCapacity());
List<SystemRoleListVO> roleList = systemRoleMapper.selectManageList(model, pageWrap.getOrderByClause());
for (SystemRoleListVO role : roleList) {
diff --git a/server/shop/src/main/java/com/doumee/api/system/SystemRoleController.java b/server/shop/src/main/java/com/doumee/api/system/SystemRoleController.java
index cf27fba..e14aa09 100644
--- a/server/shop/src/main/java/com/doumee/api/system/SystemRoleController.java
+++ b/server/shop/src/main/java/com/doumee/api/system/SystemRoleController.java
@@ -63,7 +63,7 @@
@PostMapping("/create")
@RequiresPermissions("system:role:create")
public ApiResponse create(@Validated(OperaType.Create.class) @RequestBody SystemRole systemRole) {
- systemRole.setType(Constants.ONE);
+ systemRole.setType(Constants.TWO);
return ApiResponse.success(systemRoleBiz.create(systemRole));
}
--
Gitblit v1.9.3