修改

ruoyi-admin/src/main/java/org/dromara/web/service/SysLoginService.java

@@ -188,8 +188,8 @@ public class SysLoginService {
         loginUser.setPosts(BeanUtil.copyToList(posts, PostDTO.class));
 
         //查询用户的员工信息和居住人员信息
-        StaffManageVo staffManage = staffManageService.getInfoByUserId(userId);
-        loginUser.setStaffManage(BeanUtil.toBean(staffManage, StaffManageDTO.class));
+        List<StaffManageVo> staffManageList = staffManageService.getInfoByUserId(userId);
+        loginUser.setStaffManageList(BeanUtil.copyToList(staffManageList, StaffManageDTO.class));
         List<ResidentInfoVo> infoByUserId = residentInfoService.getInfoByUserId(userId);
         loginUser.setResidentInfoDTOList(BeanUtil.copyToList(infoByUserId, ResidentInfoDTO.class));
         return loginUser;

ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/domain/dto/StaffManageDTO.java

@@ -28,6 +28,11 @@ public class StaffManageDTO implements Serializable {
      */
     private Long userId;
 
+     /**
+     * 租户id
+     */
+    private String tenantId;
+
     /**
      * 员工姓名
      */

ruoyi-common/ruoyi-common-core/src/main/java/org/dromara/common/core/domain/model/LoginUser.java

@@ -141,7 +141,7 @@ public class LoginUser implements Serializable {
     /**
      * 员工信息
      */
-    private StaffManageDTO staffManage;
+    private List<StaffManageDTO> staffManageList;
     /**
      * 居住人员信息
      */

ruoyi-modules/ruoyi-wuye/src/main/java/org/dromara/controller/staffManage/StaffManageController.java

@@ -109,7 +109,7 @@ public class StaffManageController extends BaseController {
      */
     @SaIgnore
     @GetMapping("/getInfoByUserId/{userId}")
-    public R<StaffManageVo> getInfoByUserId(@NotNull(message = "主键不能为空")
+    public R<List<StaffManageVo>> getInfoByUserId(@NotNull(message = "主键不能为空")
                                     @PathVariable Long userId) {
         return R.ok(staffManageService.getInfoByUserId(userId));
     }

ruoyi-modules/ruoyi-wuye/src/main/java/org/dromara/mapper/StaffManageMapper.java

@@ -6,6 +6,8 @@ import org.dromara.common.mybatis.core.mapper.BaseMapperPlus;
 import org.dromara.domain.staffManage.StaffManage;
 import org.dromara.domain.staffManage.vo.StaffManageVo;
 
+import java.util.List;
+
 /**
  * 员工管理Mapper接口
  *
@@ -15,6 +17,6 @@ import org.dromara.domain.staffManage.vo.StaffManageVo;
 public interface StaffManageMapper extends BaseMapperPlus<StaffManage, StaffManageVo> {
 
     @InterceptorIgnore(tenantLine = "true", dataPermission = "false")
-    StaffManageVo getInfoByUserId(Long userId);
+    List<StaffManageVo> getInfoByUserId(Long userId);
 
 }

ruoyi-modules/ruoyi-wuye/src/main/java/org/dromara/service/IStaffManageService.java

@@ -36,7 +36,7 @@ public interface IStaffManageService {
      *
      * @param userId 用户id
      */
-    StaffManageVo getInfoByUserId(Long userId);
+    List<StaffManageVo> getInfoByUserId(Long userId);
 
     /**
      * 分页查询员工管理列表

ruoyi-modules/ruoyi-wuye/src/main/java/org/dromara/service/impl/CheckPointRecordServiceImpl.java

@@ -123,12 +123,19 @@ public class CheckPointRecordServiceImpl implements ICheckPointRecordService {
      */
     @Override
     public Boolean updateByBo(CheckPointRecordBo bo) {
-        StaffManageDTO staffManage = LoginHelper.getLoginUser().getStaffManage();
-        bo.setUpdateTime(DateUtils.getNowDate());
-        if (staffManage != null){
-            bo.setCheckUserName(staffManage.getStaffName());
-            bo.setCheckUsePhone(staffManage.getPhoneNumber());
-            bo.setCheckStaffId(staffManage.getStaffId());
+
+        //获取当前登录人的员工信息
+        List<StaffManageDTO> staffManageList = LoginHelper.getLoginUser().getStaffManageList();
+        String tenantId = LoginHelper.getTenantId();
+        List<StaffManageDTO> list = staffManageList.stream().filter(e -> e.getTenantId().equals(tenantId)).toList();
+        if(!list.isEmpty()){
+            StaffManageDTO staffManage = list.get(0);
+            bo.setUpdateTime(DateUtils.getNowDate());
+            if (staffManage != null){
+                bo.setCheckUserName(staffManage.getStaffName());
+                bo.setCheckUsePhone(staffManage.getPhoneNumber());
+                bo.setCheckStaffId(staffManage.getStaffId());
+            }
         }
         CheckPointRecord update = MapstructUtils.convert(bo, CheckPointRecord.class);
         validEntityBeforeSave(update);

ruoyi-modules/ruoyi-wuye/src/main/java/org/dromara/service/impl/StaffManageServiceImpl.java

@@ -90,7 +90,7 @@ public class StaffManageServiceImpl implements IStaffManageService {
      * @return
      */
     @Override
-    public StaffManageVo getInfoByUserId(Long userId) {
+    public List<StaffManageVo> getInfoByUserId(Long userId) {
         return baseMapper.getInfoByUserId(userId);
     }
 

ruoyi-modules/ruoyi-wuye/src/main/java/org/dromara/service/impl/StaffTrainManualServiceImpl.java

@@ -11,6 +11,7 @@ import org.dromara.common.core.utils.StringUtils;
 import org.dromara.common.mybatis.core.page.PageQuery;
 import org.dromara.common.mybatis.core.page.TableDataInfo;
 import org.dromara.common.redis.utils.RedisUtils;
+import org.dromara.common.satoken.utils.LoginHelper;
 import org.dromara.domain.staffTrain.StaffTrainManual;
 import org.dromara.domain.staffTrain.bo.StaffTrainManualBo;
 import org.dromara.domain.staffTrain.vo.StaffTrainManualVo;
@@ -52,13 +53,17 @@ public class StaffTrainManualServiceImpl implements IStaffTrainManualService {
         //获取该培训手册对象阅读人员的value值
         List<String> valueList = RedisUtils.getCacheList(READ_TRAIN + manualId);
         //获取当前登录人的员工信息
-        StaffManageDTO staffManage = getLoginUser().getStaffManage();
+        List<StaffManageDTO> staffManageList = getLoginUser().getStaffManageList();
+        String tenantId = LoginHelper.getTenantId();
+
         Long userId = getUserId();
         //获取员工姓名
         String staffName = "未知";
-        if (staffManage != null) {
-            staffName = staffManage.getStaffName();
+        List<StaffManageDTO> list = staffManageList.stream().filter(e -> e.getTenantId().equals(tenantId)).toList();
+        if(!list.isEmpty()){
+            staffName = list.get(0).getStaffName();
         }
+
         //组装value值
         String value = userId + ":" + staffName;
         if (valueList != null && valueList.size() > 0) {

ruoyi-modules/ruoyi-wuye/src/main/java/org/dromara/service/impl/StaffTrainTimeServiceImpl.java

@@ -21,6 +21,8 @@ import java.util.Collection;
 import java.util.List;
 import java.util.Map;
 
+import static org.dromara.common.satoken.utils.LoginHelper.getLoginUser;
+
 /**
  * 员工培训时长Service业务层处理
  *
@@ -106,9 +108,12 @@ public class StaffTrainTimeServiceImpl implements IStaffTrainTimeService {
             flag = baseMapper.updateById(staffTrainTime) > 0;
             return flag;
         }
-
-        StaffManageDTO staffManage = LoginHelper.getLoginUser().getStaffManage();
-        if (staffManage != null) {
+        //获取当前登录人的员工信息
+        List<StaffManageDTO> staffManageList = getLoginUser().getStaffManageList();
+        String tenantId = LoginHelper.getTenantId();
+        List<StaffManageDTO> list = staffManageList.stream().filter(e -> e.getTenantId().equals(tenantId)).toList();
+        if (!list.isEmpty()) {
+            StaffManageDTO staffManage = list.get(0);
             add.setStaffId(staffManage.getStaffId());
             add.setStaffName(staffManage.getStaffName());
             flag = baseMapper.insert(add) > 0;