feats

src/main/java/com/yunzhi/marketing/center/taUser/controller/TaUserController.java

@@ -20,6 +20,8 @@ import com.yunzhi.marketing.common.StringUtils;
 import com.yunzhi.marketing.mapper.TaRoleMapper;
 import com.yunzhi.marketing.entity.*;
 import com.yunzhi.marketing.service.*;
+import com.yunzhi.marketing.xlk.entity.Institution;
+import com.yunzhi.marketing.xlk.service.IInstitutionService;
 import io.jsonwebtoken.lang.Collections;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
@@ -87,6 +89,9 @@ public class TaUserController extends BaseController {
     @Autowired
     private ITaMiniappService iTaMiniappService;
 
+    @Autowired
+    private IInstitutionService iInstitutionService;
+
     /**
      * 分页查询列表
      * @param pageNum
@@ -313,7 +318,9 @@ public class TaUserController extends BaseController {
             //获取所有菜单
             List<SysMenu> allMenus = (List<SysMenu>) iTaUserAuthMenuService.getAllMenu(null, null,taUser.getOrgId(), roles).getData();
             List<SysButtonInMenu> allButtons = (List<SysButtonInMenu>) iTaUserAuthButtonService.getAllButton(null, null).getData();
-
+            // 获取所有组织架构
+            List<Institution> institutionList = iInstitutionService.getAllByUser(taUser);
+            taUser.setInstitutionList(institutionList);
 
             userMap.put("taUser", taUser);
             userMap.put("menuList", allMenus);

src/main/java/com/yunzhi/marketing/center/taUser/entity/TaUser.java

@@ -5,6 +5,7 @@ import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.yunzhi.marketing.entity.*;
+import com.yunzhi.marketing.xlk.entity.Institution;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.experimental.Accessors;
@@ -122,8 +123,15 @@ public class TaUser implements Serializable {
     /**
      * 组织机构编号
      */
+    @TableField(exist = false)
     private List<String> institutionIdLis;
 
+    /**
+     * 当前人员拥有的所有组织权限
+     */
+    @TableField(exist = false)
+    private List<Institution> institutionList;
+
     /**
      * 权重
      */

src/main/java/com/yunzhi/marketing/xlk/mapper/InstitutionMapper.java

@@ -4,6 +4,8 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.yunzhi.marketing.xlk.entity.Institution;
 import org.apache.ibatis.annotations.Mapper;
 
+import java.util.List;
+
 /**
  * <p>
  * 组织结构表  Mapper 接口
@@ -15,4 +17,5 @@ import org.apache.ibatis.annotations.Mapper;
 @Mapper
 public interface InstitutionMapper extends BaseMapper<Institution> {
 
+    List<Institution> getAllByUser(Integer userId);
 }

src/main/java/com/yunzhi/marketing/xlk/service/IInstitutionService.java

@@ -2,8 +2,11 @@ package com.yunzhi.marketing.xlk.service;
 
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.yunzhi.marketing.base.ResponseBean;
+import com.yunzhi.marketing.center.taUser.entity.TaUser;
 import com.yunzhi.marketing.xlk.entity.Institution;
 
+import java.util.List;
+
 /**
  * <p>
  * 组织结构表  服务类
@@ -34,4 +37,6 @@ public interface IInstitutionService extends IService<Institution> {
      * @return
      */
     ResponseBean updateInstitution(Institution institution);
+
+    List<Institution> getAllByUser(TaUser taUser);
 }

src/main/java/com/yunzhi/marketing/xlk/service/impl/InstitutionServiceImpl.java

@@ -3,6 +3,7 @@ package com.yunzhi.marketing.xlk.service.impl;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.yunzhi.marketing.base.ResponseBean;
+import com.yunzhi.marketing.center.taUser.entity.TaUser;
 import com.yunzhi.marketing.common.StringUtils;
 import com.yunzhi.marketing.xlk.entity.Institution;
 import com.yunzhi.marketing.xlk.mapper.InstitutionMapper;
@@ -153,6 +154,11 @@ public class InstitutionServiceImpl extends ServiceImpl<InstitutionMapper, Insti
         return ResponseBean.success(institution);
     }
 
+    @Override
+    public List<Institution> getAllByUser(TaUser taUser) {
+        return institutionMapper.getAllByUser(taUser.getUserId());
+    }
+
     private Institution getChildInstitution(String institutionCode, int start, int end) {
         String blocCode = institutionCode.substring(start, end);
         LambdaQueryWrapper<Institution> blocQuery = new LambdaQueryWrapper<>();

src/main/resources/mapper/xlk/InstitutionMapper.xml

@@ -2,4 +2,16 @@
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.yunzhi.marketing.xlk.mapper.InstitutionMapper">
 
+    <select id="getAllByUser" resultType="com.yunzhi.marketing.xlk.entity.Institution">
+        SELECT
+            m.*
+        FROM
+            xlk_user_institution t
+                INNER JOIN xlk_institution s ON t.institution_id = s.institution_id
+                INNER JOIN xlk_institution m ON m.institution_code LIKE CONCAT( s.institution_code, '%' )
+        WHERE
+            t.user_id = #{userId}
+        ORDER BY
+            m.institution_code * 1 ASC
+    </select>
 </mapper>