fix:update user tenant api

Author: msslulu

base/src/main/java/com/tinyengine/it/login/config/SSOInterceptor.java

@@ -18,6 +18,8 @@
 import com.tinyengine.it.login.config.context.DefaultLoginUserContext;
 import com.tinyengine.it.login.model.UserInfo;
 import com.tinyengine.it.model.entity.Tenant;
+import com.tinyengine.it.model.entity.User;
+import com.tinyengine.it.service.app.UserService;
 import jakarta.servlet.http.HttpServletRequest;
 import jakarta.servlet.http.HttpServletResponse;
 import lombok.extern.slf4j.Slf4j;
@@ -36,6 +38,8 @@ public class SSOInterceptor implements HandlerInterceptor {
 
     @Autowired
     private JwtUtil jwtUtil;
+    @Autowired
+    private UserService userService;
 
     @Override
     public boolean preHandle(HttpServletRequest request,
@@ -72,8 +76,16 @@ public boolean preHandle(HttpServletRequest request,
                 log.warn("User information is incomplete - username: {}, userId: {}", username, userId);
                 throw new ServiceException(ExceptionEnum.CM339.getResultCode(), ExceptionEnum.CM339.getResultMsg());
             }
-
-            // 存储用户信息到LoginUserContext
+            User user = userService.queryUserById(userId);// 确认用户存在
+            if (user == null) {
+                log.warn("User not found for userId: {}", userId);
+                throw new ServiceException(ExceptionEnum.CM338.getResultCode(), ExceptionEnum.CM339.getResultMsg());
+            }
+            Integer useTenantId = user.getUseTenantId();
+            for (Tenant tenant : tenants) {
+	            tenant.setIsInUse(tenant.getId().equals(useTenantId.toString()));
+            }
+// 存储用户信息到LoginUserContext
             UserInfo userInfo = new UserInfo(userId, username, tenants);
 
             userInfo.setPlatformId(platformId != null ? platformId : 0);

base/src/main/java/com/tinyengine/it/login/config/context/DefaultLoginUserContext.java

@@ -18,6 +18,7 @@ public class DefaultLoginUserContext implements LoginUserContext {
     private static final int DEFAULT_PLATFORM = 1;
     private static final String DEFAULT_TENANT = "1";
 
+
     /**
      * 返回当前用户所在的业务租户id
      *
@@ -31,11 +32,10 @@ public String getTenantId() {
             return DEFAULT_TENANT;
         }
         for (Tenant tenant : tenantList) {
-            if (tenant.getIsInUse()) {
+            if (tenant.getIsInUse()!=null&&tenant.getIsInUse()) {
                 return tenant.getId();
             }
         }
-
         return DEFAULT_TENANT;
     }
 

base/src/main/java/com/tinyengine/it/login/controller/LoginController.java

@@ -264,6 +264,13 @@ public Result<SSOTicket> setTenant(@RequestParam Integer tenantId) {
         if (!found) {
             return Result.failed(ExceptionEnum.CM341);
         }
+        //存储当前组织到LoginUserContext
+        loginUserContext.setTenants(tenantList);
+        // 更新用户当前使用组织
+        User user = new User();
+        user.setId(loginUserContext.getLoginUserId());
+        user.setUseTenantId(tenantId);
+        userService.updateUserById(user);
 
         // 通过 RequestContextHolder 获取请求
         HttpServletRequest request = ((ServletRequestAttributes) RequestContextHolder.currentRequestAttributes())

base/src/main/java/com/tinyengine/it/login/service/impl/LoginServiceImpl.java

@@ -14,6 +14,7 @@
 
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.tinyengine.it.common.base.Result;
+import com.tinyengine.it.common.context.LoginUserContext;
 import com.tinyengine.it.common.exception.ExceptionEnum;
 import com.tinyengine.it.common.exception.ServiceException;
 import com.tinyengine.it.login.service.LoginService;
@@ -42,6 +43,9 @@ public class LoginServiceImpl extends ServiceImpl<UserMapper, User> implements L
     @Autowired
     AuthUsersUnitsRolesMapper authUsersUnitsRolesMapper;
 
+    @Autowired
+    LoginUserContext loginUserContext;
+
     /**
      * 新增表t_user数据
      *
@@ -66,6 +70,7 @@ public User createUser(User user) throws Exception {
         user.setSalt(cipherText);
         user.setPublicKey(publicKeyBase64);
         user.setPrivateKey(privateKeyBase64);
+        user.setUseTenantId(Integer.valueOf(loginUserContext.getTenantId()));
         baseMapper.createUser(user);
         User result = baseMapper.queryUserById(user.getId());
         result.setPrivateKey(null);

base/src/main/java/com/tinyengine/it/model/entity/User.java

@@ -63,6 +63,9 @@ public class User {
     @Schema(name = "private_key", description = "私钥")
     private String privateKey;
 
+    @Schema(name = "use_tenant_id", description = "当前使用的租户ID")
+    private Integer useTenantId;
+
     @TableField("enable")
     @Schema(name = "enable", description = "账号是否可用")
     private Boolean isEnable;

base/src/main/java/com/tinyengine/it/service/app/impl/AppServiceImpl.java

@@ -108,10 +108,11 @@ public AppDto queryAllAppByPage(Integer currentPage, Integer pageSize, String or
             pageSize = 1000;  // 限制最大页大小
         }
         int offset = (currentPage - 1) * pageSize;
+        String tenantId = loginUserContext.getTenantId();
         List<App> apps = this.baseMapper.queryAllAppByPage(pageSize, offset, app.getName(),
             app.getIndustryId(), app.getSceneId(), app.getFramework(), orderBy, app.getCreatedBy(),
-            loginUserContext.getTenantId());
-        Integer total = this.baseMapper.queryAppTotal(loginUserContext.getTenantId());
+            tenantId);
+        Integer total = this.baseMapper.queryAppTotal(tenantId);
         AppDto appDto = new AppDto();
         appDto.setApps(apps);
         appDto.setTotal(total);

base/src/main/resources/mappers/UserMapper.xml

@@ -7,12 +7,15 @@
     <!-- 通用查询列 -->
     <sql id="Base_Column_List">
         id
-        , username, password, email, salt, public_key, private_key, enable, created_time, last_updated_time,
+        , username, password, email, salt, public_key, private_key, use_tenant_id,enable, created_time, last_updated_time,
         is_admin, is_public
     </sql>
 
     <!-- 通用条件列 -->
     <sql id="UserByCondition">
+        <if test="id!=null and id!=''">
+            AND id = #{id}
+        </if>
         <if test="username!=null and username!=''">
             AND username = #{username}
         </if>
@@ -46,6 +49,9 @@
         <if test="isPublic!=null">
             AND is_public = #{isPublic}
         </if>
+        <if test="useTenantId!=null">
+            AND use_tenant_id = #{useTenantId}
+        </if>
     </sql>
 
     <!-- 通用设置列 -->
@@ -77,6 +83,9 @@
         <if test="isPublic!=null">
             is_public = #{isPublic},
         </if>
+        <if test="useTenantId!=null">
+            use_tenant_id = #{useTenantId},
+        </if>
     </sql>
 
 
@@ -93,6 +102,8 @@
         <result column="last_updated_time" property="lastUpdatedTime"/>
         <result column="is_admin" property="isAdmin"/>
         <result column="is_public" property="isPublic"/>
+        <result column="use_tenant_id" property="useTenantId"/>
+
     </resultMap>
 
     <!-- 查询表t_user所有数据 -->
@@ -155,6 +166,7 @@
         , salt
         , public_key
         , private_key
+        , use_tenant_id
         , enable
         , created_time
         , last_updated_time
@@ -167,6 +179,7 @@
         , #{salt}
         , #{publicKey}
         , #{privateKey}
+        , #{useTenantId}
         , #{isEnable}
         , #{createdTime}
         , #{lastUpdatedTime}