Merge branch 'master' of http://8.137.121.180:10880/longping/subject_gxj

projects-service/src/main/java/com/rtrh/projects/modules/rolemeun/mapper/SecUserAuthMapper.java

@@ -0,0 +1,19 @@
+package com.rtrh.projects.modules.rolemeun.mapper;
+
+import com.rtrh.core.repository.mybatis.MyBatisRepository;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+
+/**
+ * <p>
+ *  Mapper 接口
+ * </p>
+ *
+ * @author jiangpengli
+ * @since 2025-01-07
+ */
+@MyBatisRepository
+public interface SecUserAuthMapper {
+    List<String> findSubjectAuthIdsByUserId(@Param("userId") String userId);
+}

projects-service/src/main/java/com/rtrh/projects/modules/rolemeun/mapper/SecUserAuthMapper.xml

@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.rtrh.projects.modules.rolemeun.mapper.SecUserAuthMapper">
+
+    <!-- 通用查询结果列 -->
+    <sql id="Base_Column_List">
+        id, user_id, subject_id, create_time, cat, create_user_id, last_update_user_id, last_update_time, logic_delete_flag, remark
+    </sql>
+    <select id="findSubjectAuthIdsByUserId" resultType="java.lang.String">
+        select subject_id from sec_user_auth where user_id = #{userId} and logic_delete_flag = 0
+    </select>
+
+
+</mapper>

projects-service/src/main/java/com/rtrh/projects/modules/system/vo/LoginUserVO.java

@@ -10,6 +10,12 @@ import lombok.Setter;
 @SuppressWarnings("serial")
 public class LoginUserVO implements Serializable {
 
+	/**
+	 * 序列化id
+	 */
+	private static final long serialVersionUID = 4125096758372084309L;
+
+
 	/**
 	 * 用户id
 	 */

projects/src/main/java/com/rtrh/projects/web/controller/BaseController.java

@@ -11,6 +11,7 @@ import javax.servlet.http.HttpServletResponse;
 
 import cn.hutool.core.collection.CollUtil;
 import com.rtrh.projects.modules.rolemeun.dao.SecUserAuthDao;
+import com.rtrh.projects.modules.rolemeun.mapper.SecUserAuthMapper;
 import com.rtrh.projects.modules.rolemeun.po.SecUserAuth;
 import org.apache.log4j.LogManager;
 import org.apache.log4j.Logger;
@@ -24,6 +25,9 @@ public abstract class BaseController {
 	@Resource
 	private SecUserAuthDao userAuthDao;
 
+	@Resource
+	private SecUserAuthMapper userAuthMapper;
+
 	/**
 	 * 当前用户的session
 	 */
@@ -55,8 +59,9 @@ public abstract class BaseController {
 	public List<String> getSubjectIds() {
 		TeamShiroUser principal = (TeamShiroUser)SecurityUtils.getSubject().getPrincipal();
 		if ("1".equals(principal.getStatusSubject())){
-			List<SecUserAuth> list = userAuthDao.findListByUserId(principal.getId());
-			return CollUtil.isEmpty(list)? new ArrayList<>():list.stream().map(SecUserAuth::getSubjectId).collect(Collectors.toList());
+			// List<SecUserAuth> list = userAuthDao.findListByUserId(principal.getId());
+			// return CollUtil.isEmpty(list)? new ArrayList<>():list.stream().map(SecUserAuth::getSubjectId).collect(Collectors.toList());
+			return userAuthMapper.findSubjectAuthIdsByUserId(principal.getId());
 		}else {
 			return new ArrayList<>();
 		}