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,