登录的修改

authentication/src/main/java/com/jzg/config/JzgAuthenticationProvider.java

@@ -16,6 +16,7 @@ import com.jzg.mapper.SysRoleDataScopeMapper;
 import com.jzg.service.SysUserRoleService;
 import com.jzg.service.SysUserService;
 import com.jzg.commons.util.PasswordUtils;
+import okhttp3.internal.platform.Platform;
 import org.redisson.api.RedissonClient;
 import org.springframework.security.authentication.AuthenticationProvider;
 import org.springframework.security.authentication.UsernamePasswordAuthenticationToken;
@@ -106,11 +107,19 @@ public class JzgAuthenticationProvider implements AuthenticationProvider {
         if(!authorities.stream().anyMatch(x->x.getSystem().equals(system)) && !username.equals("admin")){
             throw new SystemException("没有权限访问系统");
         }
-
+        SysUserJzgVo jzgUserInfo;
         //获取用户头像
-        SysUserJzgVo jzgUserInfo = sysUserService.getJzgUserInfo(byId.getId(),system);
-        if(!Objects.isNull(jzgUserInfo.getHeadSculpture()) && !jzgUserInfo.getHeadSculpture().isEmpty()) {
-            jzgUserInfo.setHeadSculpture(MinioUtils.getPresignedObjectUrl("jzg", jzgUserInfo.getHeadSculpture()));
+        if(SystemConstants.SYSTEM_PLATFORM.getCode().equals(system)){
+            jzgUserInfo = new SysUserJzgVo();
+            SysUser user = sysUserService.getById(byId.getId());
+            if(!Objects.isNull(user.getHeadSculpture()) && !user.getHeadSculpture().isEmpty()) {
+                jzgUserInfo.setHeadSculpture(MinioUtils.getPresignedObjectUrl("jzg", user.getHeadSculpture()));
+            }
+        }else{
+            jzgUserInfo = sysUserService.getJzgUserInfo(byId.getId(),system);
+            if(!Objects.isNull(jzgUserInfo.getHeadSculpture()) && !jzgUserInfo.getHeadSculpture().isEmpty()) {
+                jzgUserInfo.setHeadSculpture(MinioUtils.getPresignedObjectUrl("jzg", jzgUserInfo.getHeadSculpture()));
+            }
         }
         //角色数据权限
         List<String> roleIds = userPerms.stream().map(x -> x.getRoleId()).collect(Collectors.toList()).stream().distinct().collect(Collectors.toList());

platform/src/main/java/com/jzg/mapper/SysUserRoleMapper.java

@@ -12,10 +12,6 @@ import java.util.List;
 @Mapper
 public interface SysUserRoleMapper extends BaseMapper<SysUserRole> {
 
-    /**
-     * 根据用户idLIST查询角色信息
-     * @param userIdList
-     * @return
-     */
-    List<SysUserRole> queryByUserIds(@Param("idList") List<String> userIdList);
+
+    void deleteByUserId(@Param("userId") String userId);
 }

platform/src/main/java/com/jzg/service/impl/SysUserServiceImpl.java

@@ -3,7 +3,6 @@ package com.jzg.service.impl;
 import cn.hutool.core.collection.CollUtil;
 import cn.hutool.core.convert.Convert;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
-import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.jzg.commons.constants.SystemConstants;
@@ -88,12 +87,14 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser>
                 .collect(Collectors.groupingBy(SysUserRole::getUserId));
         List<SysUserRole> userRoles = nameMap.get(vo.getId());
         List<String> roleNames = new ArrayList<>();
-        userRoles.forEach(sysUserRole -> {
-            if(StringUtils.isNotEmpty(sysUserRole.getName())){
-                roleNames.add(sysUserRole.getName());
-            }
-        });
-        vo.setRoleNameList(roleNames);
+        if(CollUtil.isNotEmpty(userRoles)){
+            userRoles.forEach(sysUserRole -> {
+                if(StringUtils.isNotEmpty(sysUserRole.getName())){
+                    roleNames.add(sysUserRole.getName());
+                }
+            });
+            vo.setRoleNameList(roleNames);
+        }
         return vo;
     }
 
@@ -186,13 +187,8 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser>
         BeanUtils.copyProperties(param, user);
         this.updateById(user);
 
-        SysUserPlateInfo info = sysUserPlateInfoMapper.selectOne(new LambdaQueryWrapper<SysUserPlateInfo>()
-                .eq(SysUserPlateInfo::getUserId, user.getId()));
-
         // 删除当前用户与角色的关联信息
-        LambdaUpdateWrapper<SysUserRole> updateWrapper = new LambdaUpdateWrapper<>();
-        updateWrapper.eq(SysUserRole::getUserId, info.getId());
-        sysUserRoleMapper.delete(updateWrapper);
+        sysUserRoleMapper.deleteByUserId(user.getId());
 
         // 角色信息关联
         List<String> roleList = param.getRoleIdList();
@@ -210,7 +206,7 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser>
     @Transactional(rollbackFor = Exception.class)
     public boolean deleteByIds(List<String> ids) {
         // 删除当前用户与角色的关联信息
-        LambdaUpdateWrapper<SysUserRole> updateWrapper = new LambdaUpdateWrapper<>();
+        LambdaQueryWrapper<SysUserRole> updateWrapper = new LambdaQueryWrapper<>();
         updateWrapper.in(SysUserRole::getUserId, ids);
         sysUserRoleMapper.delete(updateWrapper);
         sysUserPlateInfoMapper.delete(new LambdaQueryWrapper<SysUserPlateInfo>().in(SysUserPlateInfo::getUserId, ids));

platform/src/main/resources/mapper/SysUserRoleMapper.xml

@@ -0,0 +1,9 @@
+<?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.jzg.mapper.SysUserRoleMapper">
+    <delete id="deleteByUserId">
+        delete from sys_user_role where user_id = #{userId}
+    </delete>
+</mapper>