From 18de904a41eb950cfd3cd9fc100177790abb0e06 Mon Sep 17 00:00:00 2001 From: cwchen <1048842385@qq.com> Date: Mon, 22 Jul 2024 20:07:42 +0800 Subject: [PATCH] =?UTF-8?q?=E8=AF=95=E9=AA=8C=E7=AE=A1=E7=90=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../basis/service/impl/ExperimentStandardServiceImpl.java | 3 +++ src/main/java/com/bonus/aqgqj/model/SysUser.java | 5 +++++ src/main/resources/mappers/system/UserMapper.xml | 6 ++++-- 3 files changed, 12 insertions(+), 2 deletions(-) diff --git a/src/main/java/com/bonus/aqgqj/basis/service/impl/ExperimentStandardServiceImpl.java b/src/main/java/com/bonus/aqgqj/basis/service/impl/ExperimentStandardServiceImpl.java index 16bbd20..59c0843 100644 --- a/src/main/java/com/bonus/aqgqj/basis/service/impl/ExperimentStandardServiceImpl.java +++ b/src/main/java/com/bonus/aqgqj/basis/service/impl/ExperimentStandardServiceImpl.java @@ -8,10 +8,13 @@ import com.bonus.aqgqj.basis.dao.ExperimentStandardMapper; import com.bonus.aqgqj.basis.entity.dto.ParamsDto; import com.bonus.aqgqj.basis.entity.vo.*; import com.bonus.aqgqj.basis.service.ExperimentStandardService; +import com.bonus.aqgqj.system.vo.LoginUser; import com.bonus.aqgqj.utils.ServerResponse; +import com.bonus.aqgqj.utils.UserUtil; import com.bonus.aqgqj.webResult.Constants; import com.bonus.aqgqj.webResult.HttpStatus; import lombok.extern.slf4j.Slf4j; +import org.apache.catalina.security.SecurityUtil; import org.apache.commons.collections4.CollectionUtils; import org.apache.commons.lang3.StringUtils; import org.springframework.stereotype.Service; diff --git a/src/main/java/com/bonus/aqgqj/model/SysUser.java b/src/main/java/com/bonus/aqgqj/model/SysUser.java index a939e71..e797c9d 100644 --- a/src/main/java/com/bonus/aqgqj/model/SysUser.java +++ b/src/main/java/com/bonus/aqgqj/model/SysUser.java @@ -111,6 +111,11 @@ public class SysUser extends PageEntity { private String status; private String newUser; + /**角色编码*/ + private String roleCode; + /**班组ID*/ + private String teamId; + public interface Status { int DISABLED = 0; diff --git a/src/main/resources/mappers/system/UserMapper.xml b/src/main/resources/mappers/system/UserMapper.xml index 27250f5..e869c40 100644 --- a/src/main/resources/mappers/system/UserMapper.xml +++ b/src/main/resources/mappers/system/UserMapper.xml @@ -48,9 +48,11 @@