修改bug

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

@@ -88,7 +88,7 @@ public class JzgAuthenticationProvider implements AuthenticationProvider {
 
         String name = "",workNumber = "",headSculpture = "";
         if(!system.equals(SystemConstants.SYSTEM_PLATFORM.getCode())){
-            SysUserJzgVo jzgUserInfo = sysUserService.getJzgUserInfo(byId.getId());
+            SysUserJzgVo jzgUserInfo = sysUserService.getJzgUserInfo(byId.getId(),system);
             name = jzgUserInfo.getName();
             workNumber = jzgUserInfo.getWorkNumber();
         }else{
@@ -108,7 +108,7 @@ public class JzgAuthenticationProvider implements AuthenticationProvider {
         }
 
         //获取用户头像
-        SysUserJzgVo jzgUserInfo = sysUserService.getJzgUserInfo(byId.getId());
+        SysUserJzgVo jzgUserInfo = sysUserService.getJzgUserInfo(byId.getId(),system);
         if(!Objects.isNull(jzgUserInfo.getHeadSculpture()) && !jzgUserInfo.getHeadSculpture().isEmpty()) {
             jzgUserInfo.setHeadSculpture(MinioUtils.getPresignedObjectUrl("jzg", jzgUserInfo.getHeadSculpture()));
         }

authentication/src/main/java/com/jzg/mapper/SysUserMapper.java

@@ -13,7 +13,7 @@ public interface SysUserMapper extends BaseMapper<SysUser> {
      * 获取晋掌柜用户信息
      * @return
      */
-    public SysUserJzgVo getJzgUserInfo(String userId);
+    public SysUserJzgVo getJzgUserInfo(String userId,String system);
 
     /**
      * 获取用户信息

authentication/src/main/java/com/jzg/service/SysUserService.java

@@ -21,7 +21,7 @@ public interface SysUserService extends IService<SysUser> {
      * @param userId
      * @return
      */
-    public SysUserJzgVo getJzgUserInfo(String userId);
+    public SysUserJzgVo getJzgUserInfo(String userId,String system);
 
 
 

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

@@ -19,8 +19,8 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> impl
     }
 
     @Override
-    public SysUserJzgVo getJzgUserInfo(String userId) {
-        SysUserJzgVo jzgUserInfo = baseMapper.getJzgUserInfo(userId);
+    public SysUserJzgVo getJzgUserInfo(String userId,String system) {
+        SysUserJzgVo jzgUserInfo = baseMapper.getJzgUserInfo(userId,system);
         return jzgUserInfo;
     }
 

authentication/src/main/resources/mapper/SysUserMapper.xml

@@ -21,6 +21,8 @@
                 LEFT JOIN sys_upload_files suf ON su.head_sculpture = suf.id
         WHERE
             su.id = #{userId}
+        AND
+            suji.system_code = #{system}
     </select>
 
     <select id="selectByUserName" resultType="com.jzg.entity.SysUser">

commons/src/main/java/com/jzg/commons/entity/po/SysUserJzgInfo.java

@@ -316,6 +316,8 @@ public class SysUserJzgInfo extends BaseModel implements Serializable {
 
     public SysUserJzgInfo(SysUser user, String systemCode){
         this.userId = user.getId();
+        //默认添加管理员账户
+        this.name = "管理员";
         this.status = 0;
         this.isEnable = 0;
         this.systemCode = systemCode;

tenant/organization/src/main/java/com/jzg/organization/service/impl/SysDeptServiceImpl.java

@@ -149,6 +149,9 @@ public class SysDeptServiceImpl extends ServiceImpl<SysDeptMapper, SysDept> impl
 
     @Override
     public List<SysDeptVo> getDeptTree(String deptId, SysDeptParam param) {
+        if(Objects.isNull(deptId)){
+            deptId = "";
+        }
         String sysCode = param.getSysCode();
         String userSystemCode = null;
         if (StringUtils.isEmpty(sysCode)){

tenant/organization/src/main/java/com/jzg/organization/service/impl/SysUserJzgInfoServiceImpl.java

@@ -25,7 +25,7 @@ public class SysUserJzgInfoServiceImpl extends ServiceImpl<SysUserJzgInfoMapper,
     @Override
     public SysUserJzgInfo getUserByUserId(String userId) {
         return baseMapper.selectOne(new LambdaQueryWrapper<SysUserJzgInfo>()
-                .eq(SysUserJzgInfo::getId, userId));
+                .eq(SysUserJzgInfo::getUserId, userId));
     }
 
 

tenant/organization/src/main/java/com/jzg/organization/service/impl/SysUserServiceImpl.java

@@ -445,11 +445,17 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> impl
             String referrerName = sysUserJzgInfoService.getById(sysUserJzgInfo.getReferrerId()).getName();
             sysUserJzgInfo.setReferrerName(referrerName);
         }
-        String organizationId = sysOrganizationUserLinkService.getOne
-                (new LambdaQueryWrapper<SysOrganizationUserLink>().eq(SysOrganizationUserLink::getUserId,sysUserJzgInfo.getId())).getOrganizationId();
-        String organizationName = sysOrganizationService.getById(organizationId).getName();
-        sysUserJzgInfo.setOrganizationId(organizationId);
-        sysUserJzgInfo.setOrganizationName(organizationName);
+        SysOrganizationUserLink sysOrganizationUserLink = sysOrganizationUserLinkService.getOne
+                (new LambdaQueryWrapper<SysOrganizationUserLink>().eq(SysOrganizationUserLink::getUserId, sysUserJzgInfo.getId()));
+
+
+        if(!Objects.isNull(sysOrganizationUserLink)){
+            String organizationId = sysOrganizationUserLink.getOrganizationId();
+            String organizationName = sysOrganizationService.getById(organizationId).getName();
+            sysUserJzgInfo.setOrganizationId(organizationId);
+            sysUserJzgInfo.setOrganizationName(organizationName);
+        }
+
         //给前端返
         sysUserJzgInfo.setPassword("******");
         //角色

tenant/organization/src/main/resources/mapper/SysUserRoleMapper.xml

@@ -7,7 +7,7 @@
             sr.*
         FROM
             sys_user_role sur
-                LEFT JOIN sys_role sr ON sur.role_id = sr.id
+                INNER JOIN sys_role sr ON sur.role_id = sr.id
         WHERE user_id = #{userId}
     </select>
 </mapper>