From c9f07c1f79e7ea9eb00925975d3ae2c9e8dcbd25 Mon Sep 17 00:00:00 2001
From: nidapeng <jp@doumee.com>
Date: 星期三, 20 三月 2024 11:37:34 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/1.0.1' into 1.0.1
---
server/service/src/main/java/com/doumee/service/system/impl/SystemRoleServiceImpl.java | 7 ++++++-
1 files changed, 6 insertions(+), 1 deletions(-)
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) {
--
Gitblit v1.9.3