修改mapper文件

dxhy-admin/src/main/java/com/dxhy/admin/sys/dao/SysUserOrgDao.java

@@ -2,6 +2,7 @@ package com.dxhy.admin.sys.dao;
 
 import java.util.List;
 
+import com.dxhy.admin.sys.entity.SysCompanyEntity;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 
@@ -46,4 +47,12 @@ public interface SysUserOrgDao extends BaseMapper<SysUserOrgEntity> {
      *            部门id
      */
     void updateDeptId(@Param("taxno") String taxno, @Param("taxname") String taxname, @Param("deptId") Long deptId);
+
+    /**
+     * 获取登陆用户对应的所有组织
+     *
+     * @param userId
+     *            用户id
+     */
+    List<SysCompanyEntity> getOrgsByUserId(Long userId);
 }

dxhy-admin/src/main/java/com/dxhy/admin/sys/entity/SysCompanyEntity.java

@@ -0,0 +1,14 @@
+package com.dxhy.admin.sys.entity;
+
+import lombok.Data;
+
+@Data
+public class SysCompanyEntity {
+    private static final long serialVersionUID = 1L;
+
+    //组织编码
+    private String companyCode;
+
+    //组织名称
+    private String companyName;
+}

dxhy-admin/src/main/java/com/dxhy/admin/sys/model/User.java

@@ -3,10 +3,7 @@ package com.dxhy.admin.sys.model;
 import java.io.Serializable;
 import java.util.List;
 
-import com.dxhy.admin.sys.entity.SysDeptEntity;
+import com.dxhy.admin.sys.entity.*;
-import com.dxhy.admin.sys.entity.SysRoleEntity;
-import com.dxhy.admin.sys.entity.SysUserBusinessEntity;
-import com.dxhy.admin.sys.entity.SysUserOrgEntity;
 import com.dxhy.common.vo.TaxOrgCode;
 
 import lombok.Data;
@@ -45,12 +42,15 @@ public class User implements Serializable {
     private List<SysRoleEntity> roles;
 
     private List<SysUserOrgEntity> userOrg;
+
     private List<TaxOrgCode> orgCodes;
 
     private List<SysUserBusinessEntity> userBusiness;
 
     private List<UserModel> userModels;
 
+    private List<SysCompanyEntity> companyCodes;
+
     private String qsStatus;
 
     private String webscoketUrl;

dxhy-admin/src/main/java/com/dxhy/admin/sys/service/SysUserOrgService.java

@@ -3,6 +3,7 @@ package com.dxhy.admin.sys.service;
 import java.util.List;
 
 import com.baomidou.mybatisplus.extension.service.IService;
+import com.dxhy.admin.sys.entity.SysCompanyEntity;
 import com.dxhy.admin.sys.entity.SysDeptEntity;
 import com.dxhy.admin.sys.entity.SysUserOrgEntity;
 
@@ -60,4 +61,12 @@ public interface SysUserOrgService extends IService<SysUserOrgEntity> {
      */
     void delete(Long userId);
 
+    /**
+     * 获取登录用户对应的所有组织
+     *
+     * @param userId
+     *            用户id
+     */
+    List<SysCompanyEntity> getOrgsByUserId(Long userId);
+
 }

dxhy-admin/src/main/java/com/dxhy/admin/sys/service/impl/SysUserOrgServiceImpl.java

@@ -5,6 +5,7 @@ import java.util.HashSet;
 import java.util.List;
 import java.util.Set;
 
+import com.dxhy.admin.sys.entity.SysCompanyEntity;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
@@ -81,6 +82,13 @@ public class SysUserOrgServiceImpl extends ServiceImpl<SysUserOrgDao, SysUserOrg
         Aops.getSelf(this).deleteUserOrg(userId);
     }
 
+    @Override
+    public List<SysCompanyEntity> getOrgsByUserId(Long userId) {
+        DynamicContextHolder.push(DbConstant.BASICS_WRITE);
+
+        return baseMapper.getOrgsByUserId(userId);
+    }
+
     @Transactional(rollbackFor = Exception.class)
     public void deleteUserOrg(Long userId) {
         baseMapper.delete(new QueryWrapper<SysUserOrgEntity>().eq("userid", userId));

dxhy-admin/src/main/java/com/dxhy/admin/sys/service/impl/SysUserServiceImpl.java

@@ -4,6 +4,7 @@ import java.util.*;
 
 import javax.annotation.Resource;
 
+import com.dxhy.common.util.StringHelper;
 import org.apache.commons.lang.RandomStringUtils;
 import org.apache.commons.lang.StringUtils;
 import org.springframework.security.crypto.bcrypt.BCryptPasswordEncoder;
@@ -282,10 +283,24 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserDao, SysUserEntity> i
                     }
                 }
             }
+            //获取组织编码
+            List<SysCompanyEntity> companyEntitys = sysUserOrgService.getOrgsByUserId(userEntity.getUserId());
+            if (companyEntitys != null && companyEntitys.size() > 0){
+                for (SysCompanyEntity companyEntity : companyEntitys) {
+                    if (companyEntity != null) {
+                        if (StringHelper.isNotBlank(companyEntity.getCompanyCode()) && StringHelper.isNotBlank(companyEntity.getCompanyName())){
+                            String companyName ="("+companyEntity.getCompanyCode()+")"+companyEntity.getCompanyName();
+                            companyEntity.setCompanyName(companyName);
+                        }
+                    }
+                }
+            }
+
             user = this.toUser(user, userEntity);
             user.setPassword("");
             user.setUserOrg(userOrgEntity);
             user.setUserBusiness(businessList);
+            user.setCompanyCodes(companyEntitys);
 
             user.setUserModels(this.getUserCompanyList(userEntity.getCompany()));
             // 刷新菜单缓存处理

dxhy-admin/src/main/resources/mapper/sys/SysUserOrgDao.xml

@@ -72,4 +72,11 @@
         where dept_id = #{deptId}
     </update>
 
+    <select id="getOrgsByUserId" parameterType="long" resultType="com.dxhy.admin.sys.entity.SysCompanyEntity">
+        select d.org_code companyCode, d.name companyName
+        from sys_user_org o left join sys_dept d
+        on o.dept_id = d.dept_id
+        where o.userid = userId
+    </select>
+
 </mapper>