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);
     }
 

amos-boot-module/amos-boot-module-biz/amos-boot-module-common-biz/src/main/java/com/yeejoin/amos/boot/module/common/biz/service/impl/OrgUsrServiceImpl.java

 package com.yeejoin.amos.boot.module.common.biz.service.impl;
 
-import java.io.Serializable;
-import java.lang.reflect.Method;
-import java.text.SimpleDateFormat;
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.Date;
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
-import java.util.stream.Collectors;
-
-import javax.annotation.Resource;
-
-import com.alibaba.fastjson.JSONObject;
-import com.google.common.collect.Maps;
-import org.apache.commons.collections4.CollectionUtils;
-import org.apache.commons.lang3.StringUtils;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.springframework.beans.BeanUtils;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.beans.factory.annotation.Value;
-import org.springframework.stereotype.Service;
-import org.springframework.util.ObjectUtils;
-import org.typroject.tyboot.component.emq.EmqKeeper;
-import org.typroject.tyboot.core.foundation.utils.Bean;
-import org.typroject.tyboot.core.foundation.utils.ValidationUtil;
-import org.typroject.tyboot.core.rdbms.service.BaseService;
-
 import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.google.common.base.Joiner;
 import com.google.common.collect.Lists;
+import com.google.common.collect.Maps;
+import com.yeejoin.amos.boot.biz.common.bo.ReginParams;
 import com.yeejoin.amos.boot.biz.common.constants.CommonConstant;
 import com.yeejoin.amos.boot.biz.common.entity.BaseEntity;
 import com.yeejoin.amos.boot.biz.common.utils.TreeParser;
-import com.yeejoin.amos.boot.module.common.api.dto.CheckObjectDto;
-import com.yeejoin.amos.boot.module.common.api.dto.CompanyDto;
-import com.yeejoin.amos.boot.module.common.api.dto.CompanyPerson;
-import com.yeejoin.amos.boot.module.common.api.dto.DynamicFormInstanceDto;
-import com.yeejoin.amos.boot.module.common.api.dto.ESOrgUsrDto;
-import com.yeejoin.amos.boot.module.common.api.dto.FormValue;
-import com.yeejoin.amos.boot.module.common.api.dto.OrgDepartmentDto;
-import com.yeejoin.amos.boot.module.common.api.dto.OrgDepartmentFormDto;
-import com.yeejoin.amos.boot.module.common.api.dto.OrgMenuDto;
-import com.yeejoin.amos.boot.module.common.api.dto.OrgPersonDto;
-import com.yeejoin.amos.boot.module.common.api.dto.OrgPersonExcelDto;
-import com.yeejoin.amos.boot.module.common.api.dto.OrgPersonFormDto;
-import com.yeejoin.amos.boot.module.common.api.dto.OrgUsrDto;
-import com.yeejoin.amos.boot.module.common.api.dto.OrgUsrExcelDto;
-import com.yeejoin.amos.boot.module.common.api.dto.OrgUsrFormDto;
-import com.yeejoin.amos.boot.module.common.api.dto.OrgUsrzhDto;
-import com.yeejoin.amos.boot.module.common.api.dto.RequestData;
-import com.yeejoin.amos.boot.module.common.api.dto.UserDto;
-import com.yeejoin.amos.boot.module.common.api.dto.UserUnitDto;
+import com.yeejoin.amos.boot.module.common.api.dto.*;
 import com.yeejoin.amos.boot.module.common.api.entity.DynamicFormColumn;
 import com.yeejoin.amos.boot.module.common.api.entity.DynamicFormInstance;
 import com.yeejoin.amos.boot.module.common.api.entity.MaintenanceCompany;
@@ -75,6 +29,26 @@ import com.yeejoin.amos.component.feign.model.FeignClientResult;
 import com.yeejoin.amos.feign.privilege.Privilege;
 import com.yeejoin.amos.feign.privilege.model.AgencyUserModel;
 import com.yeejoin.amos.feign.privilege.model.RoleModel;
+import org.apache.commons.collections4.CollectionUtils;
+import org.apache.commons.lang3.StringUtils;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.BeanUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.stereotype.Service;
+import org.springframework.util.ObjectUtils;
+import org.typroject.tyboot.component.emq.EmqKeeper;
+import org.typroject.tyboot.core.foundation.utils.Bean;
+import org.typroject.tyboot.core.foundation.utils.ValidationUtil;
+import org.typroject.tyboot.core.rdbms.service.BaseService;
+
+import javax.annotation.Resource;
+import java.io.Serializable;
+import java.lang.reflect.Method;
+import java.text.SimpleDateFormat;
+import java.util.*;
+import java.util.stream.Collectors;
 
 /**
  * 机构/部门/人员表 服务实现类
@@ -128,7 +102,6 @@ public class OrgUsrServiceImpl extends BaseService<OrgUsrDto, OrgUsr, OrgUsrMapp
         }).collect(Collectors.toList());
 
 
-
         List<OrgMenuDto> result = new ArrayList<>();
         Map<Long, OrgMenuDto> map = new HashMap<>(menuList.size());
         menuList.forEach(e -> map.put(e.getKey(), e));
@@ -395,7 +368,7 @@ public class OrgUsrServiceImpl extends BaseService<OrgUsrDto, OrgUsr, OrgUsrMapp
         if (!ObjectUtils.isEmpty(req.get("personNumber"))) {
             map.put("personNumber", req.get("personNumber"));
         }
-		if (req.containsKey("company") &&!ObjectUtils.isEmpty(req.get("company"))) {
+        if (req.containsKey("company") && !ObjectUtils.isEmpty(req.get("company"))) {
             req.put("parentId", req.get("company"));
         }
         /* BUG2680 查询部门人员错误 传递参数类型不正确 修改为string 2021-09-14 陈召 开始 */
@@ -628,8 +601,6 @@ public class OrgUsrServiceImpl extends BaseService<OrgUsrDto, OrgUsr, OrgUsrMapp
     }
 
 
-
-
     @Override
     public Map<String, Object> selectForShowByIduser(OrgUsr orgUsr, Long id) throws Exception {
         QueryWrapper<DynamicFormColumn> queryWrapper = new QueryWrapper<DynamicFormColumn>();
@@ -644,7 +615,7 @@ public class OrgUsrServiceImpl extends BaseService<OrgUsrDto, OrgUsr, OrgUsrMapp
             result.put(alertForm.getFieldCode(), null);
         }
 
-		result.put("parenName", orgUsr.getParentId() != null?getByIduser(orgUsr.getParentId()).getBizOrgName():"");
+        result.put("parenName", orgUsr.getParentId() != null ? getByIduser(orgUsr.getParentId()).getBizOrgName() : "");
 
         for (DynamicFormInstanceDto alertFormValue : list) {
             result.put(alertFormValue.getFieldCode(),
@@ -655,21 +626,6 @@ public class OrgUsrServiceImpl extends BaseService<OrgUsrDto, OrgUsr, OrgUsrMapp
     }
 
 
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
     @Override
     public List<OrgUsr> selectCompanyDepartmentMsg() {
         List<OrgUsr> list = this.baseMapper.selectCompanyDepartmentMsg();
@@ -821,7 +777,7 @@ public class OrgUsrServiceImpl extends BaseService<OrgUsrDto, OrgUsr, OrgUsrMapp
         saveOrgUsr(orgUsr, oriOrgUsr);
         // 保存动态表单数据
         updateDynamicFormInstance(orgUsr.getSequenceNbr(), OrgPersonVo.getDynamicFormValue());
-		if (orgUsr.getBizOrgCode() != null){
+        if (orgUsr.getBizOrgCode() != null) {
             OrgPersonVo.setBizOrgCode(orgUsr.getBizOrgCode());
         }
         return OrgPersonVo;
@@ -983,7 +939,7 @@ public class OrgUsrServiceImpl extends BaseService<OrgUsrDto, OrgUsr, OrgUsrMapp
         // 保存动态表单数据
         updateDynamicFormInstance(orgUsr.getSequenceNbr(), OrgDepartmentVo.getDynamicFormValue());
         OrgDepartmentVo.setBizOrgCode(orgUsr.getBizOrgCode());
-		return OrgDepartmentVo ;
+        return OrgDepartmentVo;
     }
 
     @Override
@@ -1006,6 +962,7 @@ public class OrgUsrServiceImpl extends BaseService<OrgUsrDto, OrgUsr, OrgUsrMapp
         }
         return personResult;
     }
+
     @Override
     public List<Map<String, Object>> selectForShowByListIdUser(List<Long> ids) throws Exception {
         List<Map<String, Object>> personResult = new ArrayList<>();
@@ -1016,6 +973,7 @@ public class OrgUsrServiceImpl extends BaseService<OrgUsrDto, OrgUsr, OrgUsrMapp
         }
         return personResult;
     }
+
     @Override
     public List<CompanyDto> listContractDto(Integer pageNum, Integer pageSize, RequestData requestData) {
         if (null == pageNum || null == pageSize) {
@@ -1390,14 +1348,13 @@ public class OrgUsrServiceImpl extends BaseService<OrgUsrDto, OrgUsr, OrgUsrMapp
     }
 
     @Override
-	public List<OrgMenuDto> companyTreeByUserAndType(AgencyUserModel user, String type) {
-		String userId = user.getUserId();
-		if (StringUtils.isNotBlank(userId)) {
-			List<OrgUsr> list = orgUsrMapper.companyTreeByUserAndType(userId, type);
+    public List<OrgMenuDto> companyTreeByUserAndType(ReginParams reginParams, String type) {
+        Map<String, Object> param = new HashMap<>();
+        param.put("bizOrgCode", reginParams.getPersonIdentity().getBizOrgCode());
+        param.put("type", type);
+        List<OrgUsr> list = orgUsrMapper.companyTreeByUserAndType(param);
         return buildTreeParallel(list);
     }
-		return Lists.newArrayList();
-	}
 
     @Override
     public List<CheckObjectDto> companyListByUser(AgencyUserModel user) {
@@ -1709,7 +1666,6 @@ public class OrgUsrServiceImpl extends BaseService<OrgUsrDto, OrgUsr, OrgUsrMapp
     }
 
 
-
     public OrgUsr getByIduser(Serializable id) {
         OrgUsr orgUser = this.baseMapper.selectById(id);
         return orgUser;
@@ -1889,25 +1845,25 @@ public class OrgUsrServiceImpl extends BaseService<OrgUsrDto, OrgUsr, OrgUsrMapp
         return resultMap;
     }
 
-	public  List<Map<String,Object>> queryCompanyId(String bizOrgName,List<String> codes) {
+    public List<Map<String, Object>> queryCompanyId(String bizOrgName, List<String> codes) {
 
-		return orgUsrMapper.queryCompanyId(bizOrgName,codes);
+        return orgUsrMapper.queryCompanyId(bizOrgName, codes);
     }
 
-	public  List<Map<String,Object>> queryCompanyIdNew(String bizOrgName) {
+    public List<Map<String, Object>> queryCompanyIdNew(String bizOrgName) {
 
         return orgUsrMapper.queryCompanyIdNew(bizOrgName);
     }
 
 
-	public List<Map<String,Object>> getuserDetail(Long departmentId,List<Map<String, Object>> resulLists){
-		OrgUsr resulList =this.baseMapper.selectById(departmentId);
-		if(resulList.getParentId()!=null) {
-			Map<String, Object> resultMap =new HashMap<String, Object>();
+    public List<Map<String, Object>> getuserDetail(Long departmentId, List<Map<String, Object>> resulLists) {
+        OrgUsr resulList = this.baseMapper.selectById(departmentId);
+        if (resulList.getParentId() != null) {
+            Map<String, Object> resultMap = new HashMap<String, Object>();
             resultMap.put("departmentId", resulList.getSequenceNbr());
             resulLists.add(resultMap);
-			return	getuserDetail(Long.parseLong(resulList.getParentId()),resulLists);
-		}else {
+            return getuserDetail(Long.parseLong(resulList.getParentId()), resulLists);
+        } else {
             return resulLists;
         }
     }
@@ -2031,7 +1987,7 @@ public class OrgUsrServiceImpl extends BaseService<OrgUsrDto, OrgUsr, OrgUsrMapp
 			orgUsr.setBizOrgCode(getOrgCodeStr());
 		}*/
         OrgUsrDto result = new OrgUsrDto();
-		if(orgUsr.getSequenceNbr() != null) { // 走更新方法
+        if (orgUsr.getSequenceNbr() != null) { // 走更新方法
             this.updateById(orgUsr);
             BeanUtils.copyProperties(orgUsr, result);
         } else {
@@ -2093,7 +2049,7 @@ public class OrgUsrServiceImpl extends BaseService<OrgUsrDto, OrgUsr, OrgUsrMapp
         return userDto;
     }
 
-	public Object getOrgUserByAmosUserId(String amosUserId) throws Exception{
+    public Object getOrgUserByAmosUserId(String amosUserId) throws Exception {
         LambdaQueryWrapper<OrgUsr> wrapper = new LambdaQueryWrapper<OrgUsr>();
         wrapper.eq(OrgUsr::getIsDelete, false);
         wrapper.eq(OrgUsr::getBizOrgType, CommonConstant.BIZ_ORG_TYPE_PERSON);
@@ -2104,7 +2060,7 @@ public class OrgUsrServiceImpl extends BaseService<OrgUsrDto, OrgUsr, OrgUsrMapp
 
     @Override
     public List<OrgUsr> getListByBizOrgTypeCode(String orgTypes, String orgCode) {
-		LambdaQueryWrapper<OrgUsr> wrapper = new LambdaQueryWrapper<OrgUsr>();
+        LambdaQueryWrapper<OrgUsr> wrapper = new LambdaQueryWrapper<>();
         wrapper.eq(OrgUsr::getIsDelete, false);
         if (!StringUtils.isEmpty(orgTypes)) {
             List<String> orgUserIdList = Lists.newArrayList(orgTypes.split(","));