userId遗漏点

takai-admin/src/main/java/com/takai/init/InitDataLoader.java

@@ -33,18 +33,18 @@ public class InitDataLoader implements CommandLineRunner {
     }
 
     private void loadData() {
-//        System.out.println("========================初始化智谱信息()");
-//        bigModelService.initZhiPuInfo();
-//        System.out.println("========================初始化智谱信息结束()");
-//
-//        System.out.println("========================初始化DeepSeek信息()");
-//        takaiService.initDeepseekInfo();
-//        System.out.println("========================初始化DeepSeek信息结束()");
-
-//        log.info("===================获取建科统一用户平台信息Job开始执行==============");
+        System.out.println("========================初始化智谱信息()");
+        bigModelService.initZhiPuInfo();
+        System.out.println("========================初始化智谱信息结束()");
+
+        System.out.println("========================初始化DeepSeek信息()");
+        takaiService.initDeepseekInfo();
+        System.out.println("========================初始化DeepSeek信息结束()");
+
+        log.info("===================获取建科统一用户平台信息Job开始执行==============");
         threadPoolTaskExecutor.execute(() -> syncJkData());
-//
-//        log.info("===================获取建科统一用户平台信息Job执行结束==============");
+
+        log.info("===================获取建科统一用户平台信息Job执行结束==============");
     }
 
     private void syncJkData() {

takai-admin/src/main/java/com/takai/web/controller/system/SysUserController.java

@@ -110,7 +110,7 @@ public class SysUserController extends BaseController
         {
             SysUser sysUser = userService.selectUserById(userId);
             ajax.put(AjaxResult.DATA_TAG, sysUser);
-            ajax.put("postIds", postService.selectPostListByUserId(Long.valueOf(userId)));
+            ajax.put("postIds", postService.selectPostListByUserId(userId));
             ajax.put("roleIds", sysUser.getRoles().stream().map(SysRole::getRoleId).collect(Collectors.toList()));
         }
         return ajax;

takai-system/src/main/java/com/takai/system/mapper/SysPostMapper.java

@@ -39,7 +39,7 @@ public interface SysPostMapper
      * @param userId 用户ID
      * @return 选中岗位ID列表
      */
-    public List<Long> selectPostListByUserId(Long userId);
+    public List<Long> selectPostListByUserId(String userId);
 
     /**
      * 查询用户所属岗位组

takai-system/src/main/java/com/takai/system/service/ISysPostService.java

@@ -41,7 +41,7 @@ public interface ISysPostService
      * @param userId 用户ID
      * @return 选中岗位ID列表
      */
-    public List<Long> selectPostListByUserId(Long userId);
+    public List<Long> selectPostListByUserId(String userId);
 
     /**
      * 校验岗位名称

takai-system/src/main/java/com/takai/system/service/impl/SysPostServiceImpl.java

@@ -70,7 +70,7 @@ public class SysPostServiceImpl implements ISysPostService
      * @return 选中岗位ID列表
      */
     @Override
-    public List<Long> selectPostListByUserId(Long userId)
+    public List<Long> selectPostListByUserId(String userId)
     {
         return postMapper.selectPostListByUserId(userId);
     }

takai-system/src/main/java/com/takai/system/service/impl/SysUserServiceImpl.java

@@ -171,7 +171,7 @@ public class SysUserServiceImpl implements ISysUserService
     {
         String userId = StringUtils.isNull(user.getUserId()) ? "-1" : user.getUserId();
         SysUser info = userMapper.checkUserNameUnique(user.getUserName());
-        if (StringUtils.isNotNull(info) && info.getUserId() != userId)
+        if (StringUtils.isNotNull(info) && !userId.equals(info.getUserId()))
         {
             return UserConstants.NOT_UNIQUE;
         }
@@ -189,7 +189,7 @@ public class SysUserServiceImpl implements ISysUserService
     {
         String userId = StringUtils.isNull(user.getUserId()) ? "-1" : user.getUserId();
         SysUser info = userMapper.checkPhoneUnique(user.getPhonenumber());
-        if (StringUtils.isNotNull(info) && info.getUserId() != userId)
+        if (StringUtils.isNotNull(info) && !userId.equals(info.getUserId()))
         {
             return UserConstants.NOT_UNIQUE;
         }
@@ -207,7 +207,7 @@ public class SysUserServiceImpl implements ISysUserService
     {
         String userId = StringUtils.isNull(user.getUserId()) ? "-1" : user.getUserId();
         SysUser info = userMapper.checkEmailUnique(user.getEmail());
-        if (StringUtils.isNotNull(info) && info.getUserId() != userId)
+        if (StringUtils.isNotNull(info) && !userId.equals(info.getUserId()))
         {
             return UserConstants.NOT_UNIQUE;
         }

takai-system/src/main/resources/mapper/system/SysPostMapper.xml

@@ -46,7 +46,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 		where post_id = #{postId}
 	</select>
 	
-	<select id="selectPostListByUserId" parameterType="Long" resultType="Long">
+	<select id="selectPostListByUserId" parameterType="String" resultType="Long">
 		select p.post_id
         from sys_post p
 	        left join sys_user_post up on up.post_id = p.post_id

takai-system/src/main/resources/mapper/system/SysUserPostMapper.xml

@@ -9,7 +9,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 		<result property="postId"     column="post_id"      />
 	</resultMap>
 
-	<delete id="deleteUserPostByUserId" parameterType="Long">
+	<delete id="deleteUserPostByUserId" parameterType="String">
 		delete from sys_user_post where user_id=#{userId}
 	</delete>
 	
@@ -17,7 +17,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 	    select count(1) from sys_user_post where post_id=#{postId}  
 	</select>
 	
-	<delete id="deleteUserPost" parameterType="Long">
+	<delete id="deleteUserPost" parameterType="String">
  		delete from sys_user_post where user_id in
  		<foreach collection="array" item="userId" open="(" separator="," close=")">
  			#{userId}

takai-system/src/main/resources/mapper/system/SysUserRoleMapper.xml

@@ -9,7 +9,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 		<result property="roleId"     column="role_id"      />
 	</resultMap>
 
-	<delete id="deleteUserRoleByUserId" parameterType="Long">
+	<delete id="deleteUserRoleByUserId" parameterType="String">
 		delete from sys_user_role where user_id=#{userId}
 	</delete>
 	
@@ -17,7 +17,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 	    select count(1) from sys_user_role where role_id=#{roleId}  
 	</select>
 	
-	<delete id="deleteUserRole" parameterType="Long">
+	<delete id="deleteUserRole" parameterType="String">
  		delete from sys_user_role where user_id in
  		<foreach collection="array" item="userId" open="(" separator="," close=")">
  			#{userId}