item：新增获取用户单位归属接口

amos-boot-module/amos-boot-module-api/amos-boot-module-common-api/src/main/java/com/yeejoin/amos/boot/module/common/api/dto/UserUnitDto.java

+package com.yeejoin.amos.boot.module.common.api.dto;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * 单位归属
+ *
+ * @author gaojianqiang
+ * @date 2021-08-19
+ */
+@Data
+@ApiModel(value = "UserUnitDto", description = "用户单位归属")
+public class UserUnitDto {
+
+    @ApiModelProperty(value = "人员类型1-维保公司；2-业主单位")
+    private String identityType;
+
+    @ApiModelProperty(value = "人员id")
+    private String personSeq;
+
+    @ApiModelProperty(value = "人员名称")
+    private String personName;
+
+    @ApiModelProperty(value = "公司id")
+    private String companyId;
+
+}

amos-boot-module/amos-boot-module-api/amos-boot-module-common-api/src/main/java/com/yeejoin/amos/boot/module/common/api/enums/UserUnitTypeEnum.java

+package com.yeejoin.amos.boot.module.common.api.enums;
+
+import lombok.AllArgsConstructor;
+import lombok.Getter;
+
+@Getter
+@AllArgsConstructor
+public enum UserUnitTypeEnum {
+    MAINTENANCE_COMPANY("1", "维保公司"),
+    OWNER_UNIT("2", "业主单位");
+
+    private String value;
+    private String name;
+
+}

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

@@ -68,4 +68,6 @@ public interface OrgUsrMapper extends BaseMapper<OrgUsr> {
      * 查询单位基本信息列表和单位下所有的重点部位数量。
      */
     List<OrgUsrTreeDto> getCompanyAndKeySite(Long companyId);
+
+    List<UserUnitDto>  getUserUnit(String id, String type, String code);
 }

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

 package com.yeejoin.amos.boot.module.common.api.service;
 
-import java.util.Collection;
-import java.util.List;
-import java.util.Map;
-
 import com.baomidou.mybatisplus.core.metadata.IPage;
 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;
 import com.yeejoin.amos.feign.privilege.model.AgencyUserModel;
-
+import java.util.Collection;
+import java.util.List;
+import java.util.Map;
 
 /**
  * 机构/部门/人员表 服务类
@@ -20,6 +18,7 @@ import com.yeejoin.amos.feign.privilege.model.AgencyUserModel;
 public interface IOrgUsrService {
     /**
      * 查询上级单位
+     *
      * @param parent_id
      * @return
      */
@@ -27,6 +26,7 @@ public interface IOrgUsrService {
 
     /**
      * 获取父级
+     *
      * @param topId
      * @param entityList
      * @param packageURL
@@ -43,6 +43,7 @@ public interface IOrgUsrService {
 
     /**
      * 获取子数据集合
+     *
      * @param topId
      * @param entityList
      * @param packageURL
@@ -59,6 +60,7 @@ public interface IOrgUsrService {
 
     /**
      * 组装融合调度单位人员信息
+     *
      * @param ids
      * @return
      * @throws Exception
@@ -67,6 +69,7 @@ public interface IOrgUsrService {
 
     /**
      * 获取动态表单数据
+     *
      * @param id
      * @return
      * @throws Exception
@@ -75,17 +78,19 @@ public interface IOrgUsrService {
 
     /**
      * 保存 机构/部门/人员基本信息
+     *
      * @param
      * @throws Exception
      */
-	void saveOrgUsr (OrgUsr orgUsr, OrgUsr oriOrgUsr) throws Exception;
+    void saveOrgUsr(OrgUsr orgUsr, OrgUsr oriOrgUsr) throws Exception;
 
     /**
      * 新增机构/部门/人员基本信息和动态表单数据
+     *
      * @param orgUsr
      * @param alertFromValuelist
      */
-	void saveOrgUsrDynamicFormInstance (OrgUsr orgUsr,List<DynamicFormInstance> alertFromValuelist)throws Exception;
+    void saveOrgUsrDynamicFormInstance(OrgUsr orgUsr, List<DynamicFormInstance> alertFromValuelist) throws Exception;
 
     /**
      * 更新机构/部门/人员基本信息和动态表单数据
@@ -94,32 +99,31 @@ public interface IOrgUsrService {
      * @param fromValueList 动态表单数据列表
      * @throws Exception
      */
-	void updateDynamicFormInstance(Long instanceId, List<DynamicFormInstance> fromValueList)throws Exception;
+    void updateDynamicFormInstance(Long instanceId, List<DynamicFormInstance> fromValueList) throws Exception;
 
     /**
-	 *
      * @param id
      * @throws Exception
      */
-	Map<String, Object> selectForShowById (OrgUsr orgUsr,Long id) throws Exception;
+    Map<String, Object> selectForShowById(OrgUsr orgUsr, Long id) throws Exception;
 
     List<OrgUsr> selectCompanyDepartmentMsg();
 
-	void saveOrgUsr( OrgUsrDto OrgUsrDto) throws Exception;
+    void saveOrgUsr(OrgUsrDto OrgUsrDto) throws Exception;
 
-	void saveOrgPerson( OrgPersonDto OrgPersonDto) throws Exception;
+    void saveOrgPerson(OrgPersonDto OrgPersonDto) throws Exception;
 
-	void updateByIdOrgUsr(OrgUsrDto OrgUsrDto,Long id) throws Exception;
+    void updateByIdOrgUsr(OrgUsrDto OrgUsrDto, Long id) throws Exception;
 
-	void updateByIdOrgPerson(OrgPersonDto OrgPersonDto,Long id) throws Exception;
+    void updateByIdOrgPerson(OrgPersonDto OrgPersonDto, Long id) throws Exception;
 
     OrgUsrFormDto selectCompanyById(Long id) throws Exception;
 
     IPage bizOrgTypeListPage(String pageNum, String pageSize, String bizOrgType) throws Exception;
 
-	void saveDepartment(List<OrgDepartmentDto> OrgDepartmentDto, Long id)throws Exception;
+    void saveDepartment(List<OrgDepartmentDto> OrgDepartmentDto, Long id) throws Exception;
 
-	void saveCompany(List<OrgUsrDto> OrgUsrDto)throws Exception;
+    void saveCompany(List<OrgUsrDto> OrgUsrDto) throws Exception;
 
     OrgPersonFormDto selectPersonById(Long id) throws Exception;
 
@@ -127,11 +131,11 @@ public interface IOrgUsrService {
 
     List<OrgMenuDto> selectPersonTree() throws Exception;
 
-	void savePersonList (List <OrgPersonDto> OrgPersonDto)throws Exception;
+    void savePersonList(List<OrgPersonDto> OrgPersonDto) throws Exception;
 
     void saveOrgDepartment(OrgDepartmentDto OrgDepartmentDto) throws Exception;
 
-	void updateByIdOrgDepartment ( OrgDepartmentDto OrgDepartmentDto,Long id) throws Exception;
+    void updateByIdOrgDepartment(OrgDepartmentDto OrgDepartmentDto, Long id) throws Exception;
 
     OrgDepartmentFormDto selectDepartmentById(Long id) throws Exception;
 
@@ -140,18 +144,19 @@ public interface IOrgUsrService {
 
     /**
      * * @param null
-	 * @return
-	 * <PRE>
+     *
+     * @return <PRE>
      * author tw
      * date 2021/7/20
      * </PRE>
      * 列表
      */
     List<CompanyDto> listContractDto(Integer pageNum, Integer pageSize, RequestData requestData);
+
     /**
      * * @param null
-	 * @return
-	 * <PRE>
+     *
+     * @return <PRE>
      * author tw
      * date 2021/7/20
      * </PRE>
@@ -161,8 +166,8 @@ public interface IOrgUsrService {
 
     /**
      * * @param null
-      * @return
-      * <PRE>
+     *
+     * @return <PRE>
      * author tw
      * date 2021/7/26
      * </PRE>
@@ -170,11 +175,13 @@ public interface IOrgUsrService {
 
     List<OrgUsrzhDto> getOrgUsrzhDto(String name);
 
-	
     List<ESOrgUsrDto> selectByIddata(String name);
 
-	List< Map<String,Object>> getparent();
-	List< OrgUsrExcelDto> exportToExcel();
+    List<Map<String, Object>> getparent();
+
+    List<OrgUsrExcelDto> exportToExcel();
+
+    UserUnitDto getUserUnit(String id, String type, String code);
 
 	/**
 	 * 根据登陆人获取公司部门人员树

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

@@ -307,8 +307,28 @@ LEFT JOIN (
       FROM important_companys
 
     </select>
-
-
+    <select id="getUserUnit" resultType="com.yeejoin.amos.boot.module.common.api.dto.UserUnitDto">
+        SELECT
+            u.sequence_nbr AS personSeq,
+            u.biz_org_name AS personName,
+            '2' AS identityType,
+            IFNULL( LEFT ( u.biz_org_code, 6 ), '' ) AS companyId
+        FROM
+            `cb_org_usr` u
+        <where>
+            <if test="id != null and id != ''">
+                u.amos_org_id = #{id}
+            </if>
+            <if test="type != null and type != ''">
+                AND u.biz_org_type = #{type}
+            </if>
+            <if test="code != null and code != ''">
+                AND u.biz_org_code LIKE CONCAT(#{code}, '%')
+            </if>
+        </where>
+        ORDER BY
+            u.sequence_nbr DESC
+    </select>
     <select id="exportToExcel" resultType="com.yeejoin.amos.boot.module.common.api.dto.OrgUsrExcelDto">
          select
     a.biz_org_name bizOrgName,

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

 package com.yeejoin.amos.boot.module.common.biz.controller;
 
 
-import java.util.Arrays;
-import java.util.List;
-import java.util.Map;
-
-import javax.servlet.http.HttpServletRequest;
-
-import com.yeejoin.amos.boot.module.common.api.dto.*;
-import com.yeejoin.amos.feign.privilege.model.AgencyUserModel;
-import org.apache.commons.lang3.StringUtils;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.data.elasticsearch.core.SearchHits;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestMethod;
-import org.springframework.web.bind.annotation.RestController;
-import org.typroject.tyboot.core.foundation.enumeration.UserType;
-import org.typroject.tyboot.core.restful.doc.TycloudOperation;
-import org.typroject.tyboot.core.restful.utils.ResponseHelper;
-import org.typroject.tyboot.core.restful.utils.ResponseModel;
-
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
@@ -29,18 +8,25 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.yeejoin.amos.boot.biz.common.constants.CommonConstant;
 import com.yeejoin.amos.boot.biz.common.controller.BaseController;
 import com.yeejoin.amos.boot.biz.common.utils.NameUtils;
-import com.yeejoin.amos.boot.module.common.api.dto.CompanyPerson;
-import com.yeejoin.amos.boot.module.common.api.dto.ESOrgUsrDto;
-import com.yeejoin.amos.boot.module.common.api.dto.OrgDepartmentDto;
-import com.yeejoin.amos.boot.module.common.api.dto.OrgMenuDto;
-import com.yeejoin.amos.boot.module.common.api.dto.OrgUsrDto;
-import com.yeejoin.amos.boot.module.common.api.dto.OrgUsrFormDto;
+import com.yeejoin.amos.boot.module.common.api.dto.*;
 import com.yeejoin.amos.boot.module.common.api.entity.OrgUsr;
 import com.yeejoin.amos.boot.module.common.biz.service.impl.ESOrgUsrService;
 import com.yeejoin.amos.boot.module.common.biz.service.impl.OrgUsrServiceImpl;
-
+import com.yeejoin.amos.feign.privilege.model.AgencyUserModel;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
+import org.apache.commons.lang3.StringUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+import org.typroject.tyboot.core.foundation.enumeration.UserType;
+import org.typroject.tyboot.core.restful.doc.TycloudOperation;
+import org.typroject.tyboot.core.restful.utils.ResponseHelper;
+import org.typroject.tyboot.core.restful.utils.ResponseModel;
+
+import javax.servlet.http.HttpServletRequest;
+import java.util.Arrays;
+import java.util.List;
+import java.util.Map;
 
 
 /**
@@ -108,7 +94,7 @@ public class  OrgUsrController extends BaseController {
     @ApiOperation(httpMethod = "PUT", value = "更新单位数据", notes = "更新单位数据")
     public ResponseModel<?> updateByIdOrgUsr(HttpServletRequest request, @RequestBody OrgUsrDto OrgUsrVo, @PathVariable Long id) throws Exception {
         OrgUsrVo.setBizOrgType(CommonConstant.BIZ_ORG_TYPE_COMPANY);
-    	iOrgUsrService.updateByIdOrgUsr(OrgUsrVo,id);
+        iOrgUsrService.updateByIdOrgUsr(OrgUsrVo, id);
         return ResponseHelper.buildResponse(null);
     }
 
@@ -137,48 +123,48 @@ public class  OrgUsrController extends BaseController {
     @RequestMapping(value = "/selectByBizOrgType/{bizOrgType}", method = RequestMethod.GET)
     @ApiOperation(httpMethod = "GET", value = "根据bizOrgType分页查询", notes = "根据bizOrgType分页查询")
     public ResponseModel<IPage<OrgUsr>> bizOrgTypeListPage(String pageNum, String pageSize, @PathVariable String bizOrgType) throws Exception {
-        return ResponseHelper.buildResponse(iOrgUsrService.page( iOrgUsrService.bizOrgTypeListPage(pageNum,pageSize,bizOrgType)));
+        return ResponseHelper.buildResponse(iOrgUsrService.page(iOrgUsrService.bizOrgTypeListPage(pageNum, pageSize, bizOrgType)));
     }
 
 
     /**
-     *
      * 获取单位部门树
+     *
      * @param
      * @return
      */
     @TycloudOperation(needAuth = false, ApiLevel = UserType.AGENCY)
     @RequestMapping(value = "/companyTree", method = RequestMethod.GET)
     @ApiOperation(httpMethod = "GET", value = "获取单位部门树(key为物理主键)", notes = "获取单位部门树(key为物理主键)\"")
-    public ResponseModel< List<OrgMenuDto>>selectCompanyTree() throws Exception {
+    public ResponseModel<List<OrgMenuDto>> selectCompanyTree() throws Exception {
         List<OrgMenuDto> menus = iOrgUsrService.getTree(null, iOrgUsrService.selectCompanyDepartmentMsg(), OrgUsr.class.getName(), "getSequenceNbr", 2, "getBizOrgName", "getParentId", "getBizOrgType");
         return ResponseHelper.buildResponse(menus);
     }
 
     /**
-    *
      * 获取单位部门树
+     *
      * @param
      * @return
      */
     @TycloudOperation(needAuth = false, ApiLevel = UserType.AGENCY)
     @RequestMapping(value = "/orgTree", method = RequestMethod.GET)
     @ApiOperation(httpMethod = "GET", value = "获取单位部门树(bizOrgCode为物理主键)", notes = "获取单位部门树(bizOrgCode为物理主键)\"")
-   public ResponseModel< List<OrgMenuDto>>selectCompanyTreeCode() throws Exception {
+    public ResponseModel<List<OrgMenuDto>> selectCompanyTreeCode() throws Exception {
         List<OrgMenuDto> menus = OrgUsrServiceImpl.buildTreeParallel(iOrgUsrService.selectCompanyDepartmentMsg());
         return ResponseHelper.buildResponse(menus);
     }
 
     /**
-     *
      * 获取单位部门树
+     *
      * @param
      * @return
      */
     @TycloudOperation(needAuth = false, ApiLevel = UserType.AGENCY)
     @RequestMapping(value = "/org/company/tree", method = RequestMethod.GET)
     @ApiOperation(httpMethod = "GET", value = "获取单位树(bizOrgCode为物理主键)", notes = "获取单位树(bizOrgCode为物理主键)")
-    public ResponseModel< List<OrgMenuDto>> getCompanyTree() {
+    public ResponseModel<List<OrgMenuDto>> getCompanyTree() {
         List<OrgMenuDto> menus = OrgUsrServiceImpl.buildTreeParallel(iOrgUsrService.selectCompanyList());
         return ResponseHelper.buildResponse(menus);
     }
@@ -239,7 +225,7 @@ public class  OrgUsrController extends BaseController {
     @RequestMapping(value = "/saveDepartment", method = RequestMethod.POST)
     @ApiOperation(httpMethod = "POST", value = "导入部门信息", notes = "导入部门信息")
     public ResponseModel<?> saveDepartment(HttpServletRequest request, @RequestBody List<OrgDepartmentDto> OrgDepartmentVo, @PathVariable Long id) throws Exception {
-        iOrgUsrService.saveDepartment(OrgDepartmentVo,id);
+        iOrgUsrService.saveDepartment(OrgDepartmentVo, id);
         return ResponseHelper.buildResponse(null);
     }
 
@@ -265,8 +251,8 @@ public class  OrgUsrController extends BaseController {
     @TycloudOperation(needAuth = false, ApiLevel = UserType.AGENCY)
     @RequestMapping(value = "/{ids}/users", method = RequestMethod.GET)
     @ApiOperation(httpMethod = "GET", value = "根据id获取单位人员列表", notes = "根据id获取单位人员列表")
-    public ResponseModel<List<Map<String, Object>> > selectUsersByOrgCode(HttpServletRequest request, @PathVariable List<Long> ids) throws Exception {
-        return ResponseHelper.buildResponse(iOrgUsrService.returnCompanyPersonMsg(ids)) ;
+    public ResponseModel<List<Map<String, Object>>> selectUsersByOrgCode(HttpServletRequest request, @PathVariable List<Long> ids) throws Exception {
+        return ResponseHelper.buildResponse(iOrgUsrService.returnCompanyPersonMsg(ids));
     }
 
     /**
@@ -279,13 +265,13 @@ public class  OrgUsrController extends BaseController {
     @RequestMapping(value = "/company/{ids}/person", method = RequestMethod.GET)
     @ApiOperation(httpMethod = "GET", value = "根据id获取单位人员列表", notes = "根据id获取单位人员列表")
     public ResponseModel<List<CompanyPerson>> selectCompanyPerson(@PathVariable List<Long> ids) throws Exception {
-        return ResponseHelper.buildResponse(iOrgUsrService.returnCompanyPerson(ids)) ;
+        return ResponseHelper.buildResponse(iOrgUsrService.returnCompanyPerson(ids));
     }
 
     /**
      * 根据id获取单位人员列表
      *
-     * @param ids
+     * @param amosUserId
      * @return
      */
     @TycloudOperation(needAuth = false, ApiLevel = UserType.AGENCY)
@@ -298,7 +284,7 @@ public class  OrgUsrController extends BaseController {
     /**
      * 根据名称模糊匹配
      *
-     * @param id
+     * @param name
      * @return
      */
     @TycloudOperation(needAuth = false, ApiLevel = UserType.AGENCY)
@@ -311,7 +297,7 @@ public class  OrgUsrController extends BaseController {
     /**
      * 根据名称模糊匹配
      *
-     * @param id
+     * @param name
      * @return
      */
     @TycloudOperation(needAuth = false, ApiLevel = UserType.AGENCY)
@@ -323,15 +309,15 @@ public class  OrgUsrController extends BaseController {
 
 
     /**
-     *
      * 获取单位部门树
+     *
      * @param
      * @return
      */
     @TycloudOperation(needAuth = false, ApiLevel = UserType.AGENCY)
     @RequestMapping(value = "/companyTreeByUser", method = RequestMethod.GET)
     @ApiOperation(httpMethod = "GET", value = "根据登陆人获取单位部门树", notes = "根据登陆人获取单位部门树")
-    public ResponseModel< List<OrgMenuDto>>selectCompanyTreeByUser() throws Exception {
+    public ResponseModel<List<OrgMenuDto>> selectCompanyTreeByUser() throws Exception {
         // 获取登陆人角色
         AgencyUserModel user = getUserInfo();
         List<OrgMenuDto> menus = iOrgUsrService.companyTreeByUser(user);
@@ -339,15 +325,15 @@ public class  OrgUsrController extends BaseController {
     }
 
     /**
-     *
      * 获取单位部门树
+     *
      * @param
      * @return
      */
     @TycloudOperation(needAuth = false, ApiLevel = UserType.AGENCY)
     @RequestMapping(value = "/companyUserTreeByUser", method = RequestMethod.GET)
     @ApiOperation(httpMethod = "GET", value = "根据登陆人获取单位部门用户树", notes = "根据登陆人获取单位部门用户树")
-    public ResponseModel< List<OrgMenuDto>>companyUserTreeByUser() {
+    public ResponseModel<List<OrgMenuDto>> companyUserTreeByUser() {
         // 获取登陆人角色
         AgencyUserModel user = getUserInfo();
         List<OrgMenuDto> menus = iOrgUsrService.companyUserTreeByUser(user);
@@ -355,19 +341,33 @@ public class  OrgUsrController extends BaseController {
     }
 
     /**
-     *
      * 获取单位列表
+     *
      * @param
      * @return
      */
     @TycloudOperation(needAuth = false, ApiLevel = UserType.AGENCY)
     @RequestMapping(value = "/companyListByUser", method = RequestMethod.GET)
     @ApiOperation(httpMethod = "GET", value = "根据登陆人获取单位列表", notes = "根据登陆人获取单位列表")
-    public ResponseModel< List<OrgUsrTreeDto>> companyListByUser() {
+    public ResponseModel<List<OrgUsrTreeDto>> companyListByUser() {
         // 获取登陆人角色
         AgencyUserModel user = getUserInfo();
         List<OrgUsrTreeDto> menus = iOrgUsrService.companyListByUser(user);
         return ResponseHelper.buildResponse(menus);
     }
 
+
+    /**
+     * 获取用户单位归属
+     *
+     * @param id
+     * @return
+     */
+    @TycloudOperation(needAuth = false, ApiLevel = UserType.AGENCY)
+    @RequestMapping(value = "/getUserUnit", method = RequestMethod.GET)
+    @ApiOperation(httpMethod = "GET", value = "获取用户单位归属", notes = "获取用户单位归属")
+    public ResponseModel<UserUnitDto> getUserUnit(@RequestParam String id, @RequestParam String type, @RequestParam String code) throws Exception {
+        return ResponseHelper.buildResponse(iOrgUsrService.getUserUnit(id, type, code));
+    }
+
 }
\ No newline at end of file

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

@@ -22,6 +22,7 @@ import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
+import org.springframework.util.CollectionUtils;
 import org.springframework.util.ObjectUtils;
 import org.typroject.tyboot.core.foundation.utils.Bean;
 import org.typroject.tyboot.core.rdbms.service.BaseService;
@@ -51,6 +52,7 @@ public class OrgUsrServiceImpl extends BaseService<OrgUsrDto, OrgUsr, OrgUsrMapp
     SupervisionFeign supervisionFeign;
     @Autowired
     ESOrgUsrService eSOrgUsrService;
+
     @Override
     public String selectUpUnitByParam(String id) {
         return this.baseMapper.selectUpUnitByParam(id);
@@ -129,13 +131,12 @@ public class OrgUsrServiceImpl extends BaseService<OrgUsrDto, OrgUsr, OrgUsrMapp
 //				resultList.add(menu);
 //			}
             /*	*******************topId与parentId的等值判断，修改人陈浩 on 2021/07/21---start******************************/
-			if (parentId == null ) {//topId与parentId的等值判断，修改人陈浩 on 2021/07/21
+            if (parentId == null) {//topId与parentId的等值判断，修改人陈浩 on 2021/07/21
                 OrgMenuDto menu = new OrgMenuDto(Long.valueOf(String.valueOf(IDMethodNameme.invoke(entity))),
                         String.valueOf(NAMEMethodNameme.invoke(entity)), parentId,
                         String.valueOf(OrgTypeMethodNameme.invoke(entity)), false);
                 resultList.add(menu);
-			} else if(topId !=null && topId.longValue() ==parentId.longValue())
-				 {
+            } else if (topId != null && topId.longValue() == parentId.longValue()) {
                 OrgMenuDto menu = new OrgMenuDto(Long.valueOf(String.valueOf(IDMethodNameme.invoke(entity))),
                         String.valueOf(NAMEMethodNameme.invoke(entity)), parentId,
                         String.valueOf(OrgTypeMethodNameme.invoke(entity)), false);
@@ -440,11 +441,11 @@ public class OrgUsrServiceImpl extends BaseService<OrgUsrDto, OrgUsr, OrgUsrMapp
         List<Long> deleteList = new ArrayList<>();
 
         fromValueList.parallelStream().forEach(submitFormItem -> {
-			if ( resourceMap.containsKey(submitFormItem.getFormColumnId())) {
+            if (resourceMap.containsKey(submitFormItem.getFormColumnId())) {
                 DynamicFormInstanceDto oldForm = resourceMap.get(submitFormItem.getFormColumnId());
                 submitFormItem.setSequenceNbr(oldForm.getSequenceNbr());
                 updateList.add(submitFormItem);
-			}else {
+            } else {
                 addList.add(submitFormItem);
             }
             newResourceMap.put(submitFormItem.getFormColumnId(), submitFormItem);
@@ -559,9 +560,6 @@ public class OrgUsrServiceImpl extends BaseService<OrgUsrDto, OrgUsr, OrgUsrMapp
     }
 
 
-
-
-
     public void saveOrgPersonExcel(OrgUsrExcelDto OrgPersonVo) throws Exception {
         OrgUsr orgUsr = new OrgUsr();
         BeanUtils.copyProperties(OrgPersonVo, orgUsr);
@@ -576,7 +574,6 @@ public class OrgUsrServiceImpl extends BaseService<OrgUsrDto, OrgUsr, OrgUsrMapp
         }
 
 
-
         if (!ObjectUtils.isEmpty(OrgPersonVo.getAmosOrgId())) {
             AgencyUserModel user = Privilege.agencyUserClient.queryByUserId(OrgPersonVo.getAmosOrgId()).getResult();
             OrgPersonVo.setAmosOrgCode(user.getRealName());
@@ -767,9 +764,6 @@ public class OrgUsrServiceImpl extends BaseService<OrgUsrDto, OrgUsr, OrgUsrMapp
     }
 
 
-
-
-
     @Override
     public List<CompanyDto> listContractDto(Integer pageNum, Integer pageSize, RequestData requestData) {
         if (null == pageNum || null == pageSize) {
@@ -783,14 +777,10 @@ public class OrgUsrServiceImpl extends BaseService<OrgUsrDto, OrgUsr, OrgUsrMapp
 
     @Override
     public Integer listContractDtoCount(RequestData par) {
-		return orgUsrMapper.listContractDtoCount( par);
+        return orgUsrMapper.listContractDtoCount(par);
     }
 
 
-
-
-
-
     public static String getOrgCodeStr() {
         return TreeParser.genTreeCode();
     }
@@ -945,7 +935,7 @@ public class OrgUsrServiceImpl extends BaseService<OrgUsrDto, OrgUsr, OrgUsrMapp
         }).collect(Collectors.toList());
     }
 
-	public List<OrgUsrDto> queryForListByParentIdAndOrgType( Long parentId, String bizOrgType) {
+    public List<OrgUsrDto> queryForListByParentIdAndOrgType(Long parentId, String bizOrgType) {
         return this.queryForList(null, false, parentId, bizOrgType);
     }
 
@@ -957,14 +947,14 @@ public class OrgUsrServiceImpl extends BaseService<OrgUsrDto, OrgUsr, OrgUsrMapp
         return this.queryBySeq(Long.valueOf(person.getParentId()));
     }
 
-	public OrgUsrDto queryForListByParentIdAndOrgType( String amosOrgId) {
-		return this.queryModelByParams( amosOrgId );
+    public OrgUsrDto queryForListByParentIdAndOrgType(String amosOrgId) {
+        return this.queryModelByParams(amosOrgId);
     }
 
     @Override
     public List<OrgUsrzhDto> getOrgUsrzhDto(String name) {
         // TODO Auto-generated method stub
-		List<OrgUsrzhDto> list=orgUsrMapper.getOrgUsrzhDto(name);
+        List<OrgUsrzhDto> list = orgUsrMapper.getOrgUsrzhDto(name);
         return list;
     }
 
@@ -973,16 +963,16 @@ public class OrgUsrServiceImpl extends BaseService<OrgUsrDto, OrgUsr, OrgUsrMapp
         //获取所有单位
         QueryWrapper<OrgUsr> wrapper = new QueryWrapper<>();
 
-  	  wrapper.in("biz_org_type", "DEPARTMENT","COMPANY");
+        wrapper.in("biz_org_type", "DEPARTMENT", "COMPANY");
         wrapper.eq("is_delete", 0);
-  	  if(name!=null&&!"".equals(name)) {
+        if (name != null && !"".equals(name)) {
             wrapper.like("biz_org_name", name);
         }
 
         List<OrgUsr> list = this.list(wrapper);
-  	  List<ESOrgUsrDto> lidataDtos=new ArrayList();
-    	list.forEach(orgUsr->{
-  		ESOrgUsrDto data=new ESOrgUsrDto();
+        List<ESOrgUsrDto> lidataDtos = new ArrayList();
+        list.forEach(orgUsr -> {
+            ESOrgUsrDto data = new ESOrgUsrDto();
             data.setSequenceNbr(orgUsr.getSequenceNbr());
             data.setBizOrgName(orgUsr.getBizOrgName());
             lidataDtos.add(data);
@@ -1000,16 +990,38 @@ public class OrgUsrServiceImpl extends BaseService<OrgUsrDto, OrgUsr, OrgUsrMapp
         return orgUsrMapper.exportToExcel();
     }
 
+    @Override
+    public UserUnitDto getUserUnit(String id, String type, String code) {
+        //	业主单位
+        List<UserUnitDto> list = orgUsrMapper.getUserUnit(id, type, null);
+        if (!CollectionUtils.isEmpty(list)) {
+            if (list.size() == 1) {
+                UserUnitDto userUnitDto = list.get(0);
+                String companyId = userUnitDto.getCompanyId();
+                if (StringUtils.isNotBlank(companyId) && StringUtils.isNotBlank(code)) {
+                    List<UserUnitDto> dtoList = orgUsrMapper.getUserUnit(null, code, companyId);
+                    if (!CollectionUtils.isEmpty(dtoList)) {
+                        userUnitDto.setCompanyId(dtoList.get(0).getPersonSeq());
+                        return userUnitDto;
+                    }
+                    throw new RuntimeException("未获取人员业主单位！");
+                }
+            }
+            throw new RuntimeException("人员绑定业主单位不唯一！");
+        }
+        throw new RuntimeException("人员未绑定任何单位！");
+    }
+
     public List<OrgUsr> getCompanyDetailTree() {
-		LambdaQueryWrapper<OrgUsr> wrapper= new LambdaQueryWrapper<OrgUsr>(); 
+        LambdaQueryWrapper<OrgUsr> wrapper = new LambdaQueryWrapper<OrgUsr>();
         wrapper.eq(OrgUsr::getBizOrgType, "COMPANY");
         wrapper.eq(OrgUsr::getIsDelete, false);
         return this.baseMapper.selectList(wrapper);
     }
 
     @Override
-	public List<OrgMenuDto> companyUserTreeByUser (AgencyUserModel user) {
-		LambdaQueryWrapper<OrgUsr> wrapper= new LambdaQueryWrapper<OrgUsr>();
+    public List<OrgMenuDto> companyUserTreeByUser(AgencyUserModel user) {
+        LambdaQueryWrapper<OrgUsr> wrapper = new LambdaQueryWrapper<OrgUsr>();
         wrapper.eq(OrgUsr::getIsDelete, false);
         List<OrgUsr> companyDepartmentMsgList = this.baseMapper.selectList(wrapper);
         return gettTreeByUser(user, companyDepartmentMsgList);
@@ -1019,7 +1031,9 @@ public class OrgUsrServiceImpl extends BaseService<OrgUsrDto, OrgUsr, OrgUsrMapp
     public List<OrgMenuDto> companyTreeByUser(AgencyUserModel user) {
         List<OrgUsr> companyDepartmentMsgList = selectCompanyDepartmentMsg();
         return gettTreeByUser(user, companyDepartmentMsgList);
-	};
+    }
+
+    ;
 
     @Override
     public List<OrgUsrTreeDto> companyListByUser(AgencyUserModel user) {
@@ -1060,14 +1074,14 @@ public class OrgUsrServiceImpl extends BaseService<OrgUsrDto, OrgUsr, OrgUsrMapp
     /**
      * 获取登陆人所在公司
      */
-	private Long getCompanyIdByDto (Long parentId, List<OrgUsrTreeDto> companyDepartmentMsgList) {
+    private Long getCompanyIdByDto(Long parentId, List<OrgUsrTreeDto> companyDepartmentMsgList) {
         Long pid = null;
         for (OrgUsrTreeDto orgUsr : companyDepartmentMsgList) {
             if (orgUsr.getSequenceNbr().equals(parentId)) {
                 if (orgUsr.getBizOrgType().equals(OrgPersonEnum.公司.getKey()) && ObjectUtils.isEmpty(orgUsr.getParentId())) {
                     return orgUsr.getSequenceNbr();
                 } else {
-					pid = getCompanyIdByDto(Long.parseLong(orgUsr.getParentId()),companyDepartmentMsgList);
+                    pid = getCompanyIdByDto(Long.parseLong(orgUsr.getParentId()), companyDepartmentMsgList);
                 }
             }
         }
@@ -1077,7 +1091,7 @@ public class OrgUsrServiceImpl extends BaseService<OrgUsrDto, OrgUsr, OrgUsrMapp
     /**
      * 查询单位列表
      */
-	private List<OrgUsrTreeDto> companyAndKeySiteList (List<OrgUsrTreeDto> companyList) {
+    private List<OrgUsrTreeDto> companyAndKeySiteList(List<OrgUsrTreeDto> companyList) {
         List<OrgUsrTreeDto> list = new ArrayList<>();
         if (ObjectUtils.isEmpty(companyList)) {
             return list;
@@ -1106,7 +1120,7 @@ public class OrgUsrServiceImpl extends BaseService<OrgUsrDto, OrgUsr, OrgUsrMapp
     /**
      * 获取树
      */
-	private List<OrgMenuDto> gettTreeByUser (AgencyUserModel user, List<OrgUsr> list) {
+    private List<OrgMenuDto> gettTreeByUser(AgencyUserModel user, List<OrgUsr> list) {
         List<OrgMenuDto> treeList = new ArrayList<>();
         // 需要角色为机场单位或管理员，其余角色返回空
         String code = UserRolesEnum.AIRPORTUNIT.getCode();
@@ -1119,7 +1133,7 @@ public class OrgUsrServiceImpl extends BaseService<OrgUsrDto, OrgUsr, OrgUsrMapp
                 treeList = buildTreeParallel(list);
             } else if (roles.equals(code)) {
                 // 获取当前用户所在部门树
-				treeList = getDepartmentTreeByUser(user,list);
+                treeList = getDepartmentTreeByUser(user, list);
             }
         }
         return treeList;
@@ -1136,7 +1150,7 @@ public class OrgUsrServiceImpl extends BaseService<OrgUsrDto, OrgUsr, OrgUsrMapp
         }
         for (Long key : orgRolesMap.keySet()) {
             if (!ObjectUtils.isEmpty(orgRolesMap.get(key))) {
-				for (RoleModel roleModel: orgRolesMap.get(key)) {
+                for (RoleModel roleModel : orgRolesMap.get(key)) {
                     String roleType = roleModel.getRoleType();
                     if (roleType.equals(code)) {
                         type = code;
@@ -1153,7 +1167,7 @@ public class OrgUsrServiceImpl extends BaseService<OrgUsrDto, OrgUsr, OrgUsrMapp
     /**
      * 获取当前用户所在部门/用户树
      */
-	private List<OrgMenuDto> getDepartmentTreeByUser (AgencyUserModel user,List<OrgUsr> companyDepartmentMsgList) {
+    private List<OrgMenuDto> getDepartmentTreeByUser(AgencyUserModel user, List<OrgUsr> companyDepartmentMsgList) {
 
         List<OrgMenuDto> list = new ArrayList<>();
         if (ObjectUtils.isEmpty(companyDepartmentMsgList)) {
@@ -1179,12 +1193,12 @@ public class OrgUsrServiceImpl extends BaseService<OrgUsrDto, OrgUsr, OrgUsrMapp
     /**
      * 获取登陆人关联账号
      */
-	private List<OrgUsr> orgUsrList (AgencyUserModel user) {
+    private List<OrgUsr> orgUsrList(AgencyUserModel user) {
         String userId = user.getUserId();
-		LambdaQueryWrapper<OrgUsr> wrapper= new LambdaQueryWrapper<>();
-		wrapper.eq(OrgUsr::getIsDelete,false);
-		wrapper.eq(OrgUsr::getAmosOrgId,userId);
-		wrapper.eq(OrgUsr::getBizOrgType,OrgPersonEnum.人员.getKey());
+        LambdaQueryWrapper<OrgUsr> wrapper = new LambdaQueryWrapper<>();
+        wrapper.eq(OrgUsr::getIsDelete, false);
+        wrapper.eq(OrgUsr::getAmosOrgId, userId);
+        wrapper.eq(OrgUsr::getBizOrgType, OrgPersonEnum.人员.getKey());
         List<OrgUsr> orgUsrList = this.baseMapper.selectList(wrapper);
         return orgUsrList;
     }
@@ -1192,7 +1206,7 @@ public class OrgUsrServiceImpl extends BaseService<OrgUsrDto, OrgUsr, OrgUsrMapp
     /**
      * 组装树
      */
-	private void getTreeChildre (List<OrgMenuDto> list, List<OrgMenuDto> treeList, Long parentId, Set<Long> set, List<OrgUsr> companyDepartmentMsgList) {
+    private void getTreeChildre(List<OrgMenuDto> list, List<OrgMenuDto> treeList, Long parentId, Set<Long> set, List<OrgUsr> companyDepartmentMsgList) {
         if (ObjectUtils.isEmpty(treeList) && ObjectUtils.isEmpty(companyDepartmentMsgList)) {
             return;
         }
@@ -1208,14 +1222,14 @@ public class OrgUsrServiceImpl extends BaseService<OrgUsrDto, OrgUsr, OrgUsrMapp
     /**
      * 获取登陆人所在公司
      */
-	private Long getCompanyId (Long parentId, List<OrgUsr> companyDepartmentMsgList) {
+    private Long getCompanyId(Long parentId, List<OrgUsr> companyDepartmentMsgList) {
         Long pid = null;
         for (OrgUsr orgUsr : companyDepartmentMsgList) {
             if (orgUsr.getSequenceNbr().equals(parentId)) {
                 if (orgUsr.getBizOrgType().equals(OrgPersonEnum.公司.getKey()) && ObjectUtils.isEmpty(orgUsr.getParentId())) {
                     return orgUsr.getSequenceNbr();
                 } else {
-					pid = getCompanyId(Long.parseLong(orgUsr.getParentId()),companyDepartmentMsgList);
+                    pid = getCompanyId(Long.parseLong(orgUsr.getParentId()), companyDepartmentMsgList);
                 }
             }
         }