1.修改根据登录人及类型获取公司部门树

amos-boot-module/amos-boot-module-api/amos-boot-module-common-api/src/main/java/com/yeejoin/amos/boot/module/common/api/mapper/OrgUsrMapper.java

@@ -98,7 +98,7 @@ public interface OrgUsrMapper extends BaseMapper<OrgUsr> {
 
     OrgUsr queryByUserId(@Param("userId")Long userId);
 
-    List<OrgUsr> companyTreeByUserAndType(@Param("userId") String userId, @Param("type") String type);
+    List<OrgUsr> companyTreeByUserAndType(Map<String, Object> param);
 
     OrgUsr queryBySequenceNbr(@Param("parentId") String parentId);
 }

amos-boot-module/amos-boot-module-api/amos-boot-module-common-api/src/main/java/com/yeejoin/amos/boot/module/common/api/service/IOrgUsrService.java

@@ -2,6 +2,7 @@ package com.yeejoin.amos.boot.module.common.api.service;
 
 import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.yeejoin.amos.boot.biz.common.bo.ReginParams;
 import com.yeejoin.amos.boot.module.common.api.dto.*;
 import com.yeejoin.amos.boot.module.common.api.entity.DynamicFormInstance;
 import com.yeejoin.amos.boot.module.common.api.entity.OrgUsr;
@@ -204,11 +205,11 @@ public interface IOrgUsrService {
 
     /**
      * 根据登录人及类型获取公司部门树
-     * @param user
+     * @param reginParams 公司及部门信息
      * @param type  默认查询公司及部门，公司：COMPANY，部门：DEPARTMENT
      * @return
      */
-    List<OrgMenuDto> companyTreeByUserAndType(AgencyUserModel user, String type);
+    List<OrgMenuDto> companyTreeByUserAndType(ReginParams reginParams, String type);
 
     /**
      * 根据登陆人获取公司列表(关联重点部位)

amos-boot-module/amos-boot-module-api/amos-boot-module-common-api/src/main/resources/mapper/OrgUsrMapper.xml

@@ -758,7 +758,6 @@ LEFT JOIN (
         FROM
             cb_org_usr usr
         <where>
-            usr.biz_org_code LIKE CONCAT( ( SELECT SUBSTRING( biz_org_code, 1, LENGTH( biz_org_code ) - 6 ) FROM cb_org_usr WHERE amos_org_id = #{userId} ), '%' )
             <choose>
                 <when test="type != null and type != ''">
                     AND usr.biz_org_type = #{type}

amos-boot-module/amos-boot-module-biz/amos-boot-module-common-biz/src/main/java/com/yeejoin/amos/boot/module/common/biz/controller/OrgUsrController.java

@@ -380,8 +380,8 @@ public class OrgUsrController extends BaseController {
     @ApiOperation(httpMethod = "GET", value = "根据登录人及类型获取公司部门树", notes = "根据登录人及类型获取公司部门树")
     public ResponseModel<List<OrgMenuDto>> companyTreeByUserAndType(@RequestParam(required = false) String type) throws Exception {
         // 获取登陆人角色
-        AgencyUserModel user = getUserInfo();
-        List<OrgMenuDto> menus = iOrgUsrService.companyTreeByUserAndType(user, type);
+        ReginParams reginParams = getSelectedOrgInfo();
+        List<OrgMenuDto> menus = iOrgUsrService.companyTreeByUserAndType(reginParams, type);
         return ResponseHelper.buildResponse(menus);
     }