联动力量 - （联动单位、消防专家）修改

amos-boot-biz-common/src/main/java/com/yeejoin/amos/boot/biz/common/dao/mapper/DataDictionaryMapper.java

@@ -16,7 +16,7 @@ public interface DataDictionaryMapper extends BaseMapper<DataDictionary> {
 	 * 获取领域专家的列表信息，且带有该领域下的专家统计数量
 	 * @return
 	 */
-   public List<DataDictionary>  getDataDictionaryListAndCount();
+   public List<DataDictionary>  getDataDictionaryListAndCount(String bizOrgCode);
    /**
     * 获取包含联动单位的联动单位树信息
     * @return

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

@@ -103,8 +103,8 @@ public class DataDictionaryServiceImpl extends BaseService<DataDictionaryDto, Da
 
     }
     
-    public List<DataDictionary> getDataDictionaryAndCount(){
-    	List<DataDictionary> list=	dataDictionaryMapper.getDataDictionaryListAndCount();
+    public List<DataDictionary> getDataDictionaryAndCount(String bizOrgCode){
+    	List<DataDictionary> list=	dataDictionaryMapper.getDataDictionaryListAndCount(bizOrgCode);
     	for (DataDictionary data : list) {
     		Long id = data.getSequenceNbr();
     		int num = data.getCount();

amos-boot-biz-common/src/main/resources/mapper/DataDictionaryMapper.xml

@@ -14,6 +14,9 @@ LEFT JOIN (
 		cb_fire_experts
 	WHERE
 		is_delete = 0
+	<if test='bizOrgCode != null and bizOrgCode!=""'>
+		and biz_org_code like concat(#{bizOrgCode}, '%')
+	</if>
 ) cfe ON cdd.`code` = cfe.expert_code
 WHERE
 	cdd.type = 'ZJLY'

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

@@ -166,4 +166,12 @@ public class FireExpertsDto extends BaseDto {
     @ApiModelProperty(value = "年龄")
     private Integer age;
 
+    @ExcelIgnore
+    @ApiModelProperty(value = "机构编码")
+    private String bizOrgCode;
+
+    @ExcelIgnore
+    @ApiModelProperty(value = "机构/部门名称")
+    private String bizOrgName;
+
 }

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

@@ -119,4 +119,13 @@ public class LinkageUnitDto extends BaseDto {
     @ExcelIgnore
     @ApiModelProperty(value = "特岗人数")
     private String personNumber;
+
+    @ExcelIgnore
+    @ApiModelProperty(value = "机构编码")
+    private String bizOrgCode;
+
+    @ExcelIgnore
+    @ApiModelProperty(value = "机构/部门名称")
+    private String bizOrgName;
+
 }

amos-boot-module/amos-boot-module-api/amos-boot-module-common-api/src/main/java/com/yeejoin/amos/boot/module/common/api/entity/FireExperts.java

 package com.yeejoin.amos.boot.module.common.api.entity;
 
+import com.alibaba.excel.annotation.ExcelIgnore;
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.yeejoin.amos.boot.biz.common.entity.BaseEntity;
 import io.swagger.annotations.ApiModel;
@@ -112,4 +113,10 @@ public class FireExperts extends BaseEntity {
 
     @ApiModelProperty(value = "户籍所在地详细地址")
     private String nativePlaceVal;
+
+    @ApiModelProperty(value = "机构编码")
+    private String bizOrgCode;
+
+    @ApiModelProperty(value = "机构/部门名称")
+    private String bizOrgName;
 }

amos-boot-module/amos-boot-module-api/amos-boot-module-common-api/src/main/java/com/yeejoin/amos/boot/module/common/api/entity/LinkageUnit.java

 package com.yeejoin.amos.boot.module.common.api.entity;
 
+import com.alibaba.excel.annotation.ExcelIgnore;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.yeejoin.amos.boot.biz.common.entity.BaseEntity;
+import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.experimental.Accessors;
@@ -129,4 +131,11 @@ public class LinkageUnit extends BaseEntity {
      */
 	@TableField("org_code")
     private String orgCode;
+
+    @ApiModelProperty(value = "机构编码")
+    private String bizOrgCode;
+
+    @ApiModelProperty(value = "机构/部门名称")
+    private String bizOrgName;
+
 }

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

@@ -51,15 +51,15 @@ public interface LinkageUnitMapper extends BaseMapper<LinkageUnit> {
      * @param emergencyLinkageUnitCode
      * @return
      */
-    List<Map<String, Object>> getEmergencyLinkageUnitCodeGroupByAndCount();
+    List<Map<String, Object>> getEmergencyLinkageUnitCodeGroupByAndCount(@Param("bizOrgCode") String bizOrgCode);
     
     /**
      * 查询包含特岗人数及的具体信息
      * @return
      */
     Page<List<LinkageUnitDto>> getEmergencyLinkageUnitList(IPage<LinkageUnitDto> page,String unitName,
-			 String linkageUnitType, String linkageUnitTypeCode, String emergencyLinkageUnitCode,String inAgreement);
+			 String linkageUnitType, String linkageUnitTypeCode, String emergencyLinkageUnitCode,String inAgreement, String bizOrgCode);
 
-    List<LinkageUnitDto> exportToExcel(String unitName,String linkageUnitTypeCode,String emergencyLinkageUnitCode);
+    List<LinkageUnitDto> exportToExcel(String unitName,String linkageUnitTypeCode,String emergencyLinkageUnitCode, String bizOrgCode);
     
 }

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

@@ -131,4 +131,6 @@ public interface OrgUsrMapper extends BaseMapper<OrgUsr> {
      * @return
      */
     List<DynamicFormInstance> checkCertificatesNumber(String certificatesNumber, Long orgUserId);
+
+    OrgUsr queryByCompanyCode(@Param("companyCode") String companyCode);
 }

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

@@ -21,10 +21,12 @@ public interface IFireExpertsService {
     public Page<FireExpertsDto> queryForFireExpertsPage1(Page<FireExpertsDto> page,
                                                         @Condition(Operator.eq) Boolean isDelete,
                                                         @Condition(Operator.like) String name,
-                                                        @Condition(Operator.in) List<String> expertCode);
+                                                        @Condition(Operator.in) List<String> expertCode,
+                                                         @Condition(Operator.eq)  String bizOrgCode);
     
     public Page<FireExpertsDto> queryForFireExpertsPage(Page<FireExpertsDto> page,
             @Condition(Operator.eq) Boolean isDelete,
             @Condition(Operator.like) String name,
-            @Condition(Operator.eq)String expertCode);
+            @Condition(Operator.eq)String expertCode,
+             @Condition(Operator.eq)  String bizOrgCode);
 }

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

@@ -34,16 +34,16 @@ public interface ILinkageUnitService {
 	 * @return
 	 */
 	Page<LinkageUnitDto> queryForLinkageUnitPage(IPage<LinkageUnitDto> page, Boolean isDelete, String unitName,
-			String linkageUnitTypeCode, String linkageUnitType, String emergencyLinkageUnitCode, String inAgreement);
+			String linkageUnitTypeCode, String linkageUnitType, String emergencyLinkageUnitCode, String inAgreement, String bizOrgCode);
 
 	/**
 	 * 获取当前存在的联动单位的类型组code
 	 * 
 	 * @return
 	 */
-	public List<Menu> getEmergencyLinkageUnitCodeGroupBy(String type, String rootName);
+	public List<Menu> getEmergencyLinkageUnitCodeGroupBy(String type, String rootName, String bizOrgCode);
 
-	List<LinkageUnitDto> exportToExcel(String unitName,String linkageUnitTypeCode,String emergencyLinkageUnitCode);
+	List<LinkageUnitDto> exportToExcel(String unitName,String linkageUnitTypeCode,String emergencyLinkageUnitCode, String bizOrgCode);
 
 	List<LinkageUnitDto> queryForLinkageUnitList(Boolean isDelete);
 }

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

@@ -219,6 +219,14 @@ public interface IOrgUsrService {
      */
     List<OrgMenuDto> companyTreeByUserAndType(ReginParams reginParams, String type);
 
+    /**
+     * 获取公司部门树全量
+     * @param type  默认查询公司及部门，公司：COMPANY，部门：DEPARTMENT
+     * @return
+     */
+    List<OrgMenuDto> companyTreeAll(String type);
+
+
    List<OrgUsr> companyTreeByUserAndTypeNoTree(ReginParams reginParams, String type) ;
 
     /**

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

@@ -98,6 +98,9 @@
  cb_linkage_unit
  WHERE
  is_delete = 0
+	<if test="bizOrgCode != null and bizOrgCode != ''">
+		AND biz_org_code LIKE concat(#{bizOrgCode}, '%')
+	</if>
  GROUP BY
  emergency_linkage_unit_code
 </select>
@@ -144,6 +147,9 @@
 	<if test="linkageUnitTypeCode != null and linkageUnitTypeCode != ''">
 		AND a.linkage_unit_type_code =#{linkageUnitTypeCode}
 	</if>
+	<if test="bizOrgCode != null and bizOrgCode != ''">
+		AND biz_org_code LIKE concat(#{bizOrgCode}, '%')
+	</if>
 	<if test="emergencyLinkageUnitCode != null and emergencyLinkageUnitCode != '' ">
 		<if test="emergencyLinkageUnitCode != '-1'">
 			AND a.emergency_linkage_unit_code =#{emergencyLinkageUnitCode}
@@ -184,6 +190,8 @@
 		clu.rec_user_id AS recUserId,
 		clu.rec_date AS recDate,
 		clu.is_delete AS isDelete,
+		clu.biz_org_code,
+		clu.biz_org_name,
 		(
 		SELECT
 		sum(cre.vehicle_number)
@@ -208,6 +216,9 @@
 			AND clu.unit_name LIKE concat('%',#{unitName}, '%')
 		</if>
 
+		<if test="bizOrgCode != null and bizOrgCode != ''">
+			AND clu.biz_org_code LIKE concat(#{bizOrgCode}, '%')
+		</if>
 
 		<if test="inAgreement != null and inAgreement != ''">
 			<if test='inAgreement != "是"'>

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

@@ -1050,4 +1050,13 @@ LEFT JOIN (
         </if>
              AND cou.is_delete = 0
     </select>
+
+    <select id="queryByCompanyCode" resultType="com.yeejoin.amos.boot.module.common.api.entity.OrgUsr">
+        SELECT *
+        FROM cb_org_usr
+        WHERE is_delete = 0
+        <if test="companyCode != null and companyCode != ''">
+            AND code = #{companyCode}
+        </if>
+    </select>
 </mapper>

amos-boot-module/amos-boot-module-biz/amos-boot-module-command-biz/src/main/java/com/yeejoin/amos/boot/module/command/biz/controller/CommandController.java

@@ -25,6 +25,7 @@ import com.yeejoin.amos.boot.module.common.api.entity.OrgUsr;
 import com.yeejoin.amos.boot.module.common.api.feign.EquipFeignClient;
 import com.yeejoin.amos.boot.module.common.api.feign.IotFeignClient;
 import com.yeejoin.amos.boot.module.common.api.feign.VideoFeignClient;
+import com.yeejoin.amos.boot.module.common.api.mapper.OrgUsrMapper;
 import com.yeejoin.amos.boot.module.common.api.service.*;
 import com.yeejoin.amos.boot.module.jcs.api.dto.*;
 import com.yeejoin.amos.boot.module.jcs.api.entity.AlertCalled;
@@ -45,6 +46,7 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.http.ResponseEntity;
 import org.springframework.util.ObjectUtils;
+import org.springframework.util.StringUtils;
 import org.springframework.web.bind.annotation.*;
 import org.springframework.web.client.RestTemplate;
 import org.typroject.tyboot.core.foundation.context.RequestContext;
@@ -158,6 +160,9 @@ public class CommandController extends BaseController {
     @Autowired
     RestTemplate restTemplate;
 
+    @Autowired
+    private OrgUsrMapper orgUsrMapper;
+
     /**
      * 警情列表
      *
@@ -705,12 +710,19 @@ public class CommandController extends BaseController {
     @ApiOperation(httpMethod = "GET", value = "外部专家分页查询", notes = "外部专家分页查询")
     public ResponseModel<IPage<FireExpertsDto>> queryForPage(@RequestParam(value = "pageNum") int pageNum,
                                                              @RequestParam(value = "pageSize") int pageSize,
-                                                             FireExpertsDto fireExpertsDto) {
+                                                             FireExpertsDto fireExpertsDto,
+                                                             @RequestParam(required = false, value = "companyCode") String companyCode) {
+        if (!StringUtils.isEmpty(companyCode)) {
+            OrgUsr orgUsr = orgUsrMapper.queryByCompanyCode(companyCode);
+            if (org.apache.commons.lang3.ObjectUtils.isNotEmpty(orgUsr)) {
+                fireExpertsDto.setBizOrgCode(orgUsr.getBizOrgCode());
+            }
+        }
         Page<FireExpertsDto> page = new Page<>();
         page.setCurrent(pageNum);
         page.setSize(pageSize);
         Page<FireExpertsDto> fireExpertsDtoPage = fireExpertsService.queryForFireExpertsPage(page, false,
-                fireExpertsDto.getName(), fireExpertsDto.getExpertCode());
+                fireExpertsDto.getName(), fireExpertsDto.getExpertCode(), fireExpertsDto.getBizOrgCode());
         return ResponseHelper.buildResponse(fireExpertsDtoPage);
     }
 
@@ -718,11 +730,11 @@ public class CommandController extends BaseController {
     @TycloudOperation(needAuth = true, ApiLevel = UserType.AGENCY)
     @GetMapping(value = "LinkageUnitDto/page")
     @ApiOperation(httpMethod = "GET", value = "联动单位分页查询", notes = "联动单位分页查询")
-    public ResponseModel<Page<LinkageUnitDto>> LinkageUnitDtoQueryForPage(@RequestParam(value = "pageNum") int pageNum, @RequestParam(value = "pageSize") int pageSize, String unitName, String linkageUnitTypeCode, String linkageUnitType, String inAgreement) {
+    public ResponseModel<Page<LinkageUnitDto>> LinkageUnitDtoQueryForPage(@RequestParam(value = "pageNum") int pageNum, @RequestParam(value = "pageSize") int pageSize, String unitName, String linkageUnitTypeCode, String linkageUnitType, String inAgreement,  @RequestParam(required = false) String bizOrgCode) {
         Page<LinkageUnitDto> page = new Page<LinkageUnitDto>();
         page.setCurrent(pageNum);
         page.setSize(pageSize);
-        Page<LinkageUnitDto> linkageUnitDtoPage = iLinkageUnitService.queryForLinkageUnitPage(page, false, unitName, linkageUnitTypeCode, linkageUnitType, null, inAgreement);
+        Page<LinkageUnitDto> linkageUnitDtoPage = iLinkageUnitService.queryForLinkageUnitPage(page, false, unitName, linkageUnitTypeCode, linkageUnitType, null, inAgreement, bizOrgCode);
         return ResponseHelper.buildResponse(linkageUnitDtoPage);
     }
 
@@ -731,7 +743,15 @@ public class CommandController extends BaseController {
     @RequestMapping(value = "/getFirefighters", method = RequestMethod.GET)
     @ApiOperation(httpMethod = "GET", value = "内部专家列表分页查询", notes = "内部专家列表分页查询")
     public ResponseModel<Page<FirefightersZhDto>> getFirefighters(Integer pageNum, Integer pageSize,
-                                                                  FirefightersDto firefighters) {
+                                                                  FirefightersDto firefighters,
+                                                                  @RequestParam(required = false) String companyCode) {
+
+        if (!StringUtils.isEmpty(companyCode)) {
+            OrgUsr orgUsr = orgUsrMapper.queryByCompanyCode(companyCode);
+            if (org.apache.commons.lang3.ObjectUtils.isNotEmpty(orgUsr)) {
+                firefighters.setBizOrgCode(orgUsr.getBizOrgCode());
+            }
+        }
         if (firefighters.getAreasExpertiseCode() == null) {
             firefighters.setAreasExpertiseCode("0");
         }

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

@@ -6,6 +6,7 @@ import com.alibaba.excel.event.AnalysisEventListener;
 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.yeejoin.amos.boot.biz.common.bo.ReginParams;
 import com.yeejoin.amos.boot.biz.common.controller.BaseController;
 import com.yeejoin.amos.boot.biz.common.dao.mapper.DataDictionaryMapper;
 import com.yeejoin.amos.boot.biz.common.entity.DataDictionary;
@@ -16,10 +17,13 @@ import com.yeejoin.amos.boot.biz.common.utils.RedisUtils;
 import com.yeejoin.amos.boot.biz.common.utils.TreeParser;
 import com.yeejoin.amos.boot.module.common.api.dto.FireExpertsDto;
 import com.yeejoin.amos.boot.module.common.api.entity.FireExperts;
+import com.yeejoin.amos.boot.module.common.api.entity.OrgUsr;
 import com.yeejoin.amos.boot.module.common.api.excel.ExcelUtil;
+import com.yeejoin.amos.boot.module.common.api.mapper.OrgUsrMapper;
 import com.yeejoin.amos.boot.module.common.biz.service.impl.FireExpertsServiceImpl;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
+import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
@@ -59,6 +63,9 @@ public class FireExpertsController extends BaseController {
     @Autowired
     DataDictionaryServiceImpl dataDictionaryService;
 
+    @Autowired
+    private OrgUsrMapper orgUsrMapper;
+
 
 
     /**
@@ -70,6 +77,13 @@ public class FireExpertsController extends BaseController {
     @PostMapping(value = "/save")
     @ApiOperation(httpMethod = "POST", value = "新增", notes = "新增")
     public ResponseModel<FireExpertsDto> save(@RequestBody FireExpertsDto model) {
+        ReginParams reginParams = getSelectedOrgInfo();
+        String companyId = reginParams.getPersonIdentity().getCompanyId();
+        if (StringUtils.isNotEmpty(companyId)) {
+            OrgUsr orgUsr = orgUsrMapper.queryBySequenceNbr(companyId);
+            model.setBizOrgCode(orgUsr.getBizOrgCode());
+            model.setBizOrgName(orgUsr.getBizOrgName());
+        }
         if (model.getExpertCode() != null){
             String expertCode = model.getExpertCode();
             DataDictionary zjly = dataDictionaryService.getByCode(expertCode, "ZJLY");
@@ -96,6 +110,13 @@ public class FireExpertsController extends BaseController {
     @ApiOperation(httpMethod = "PUT", value = "根据sequenceNbr更新", notes = "根据sequenceNbr更新")
     public ResponseModel<FireExpertsDto> updateBySequenceNbrFireExperts(@RequestBody FireExpertsDto model,
                                                                         @PathVariable(value = "sequenceNbr") Long sequenceNbr) {
+        ReginParams reginParams = getSelectedOrgInfo();
+        String companyId = reginParams.getPersonIdentity().getCompanyId();
+        if (StringUtils.isNotEmpty(companyId)) {
+            OrgUsr orgUsr = orgUsrMapper.queryBySequenceNbr(companyId);
+            model.setBizOrgCode(orgUsr.getBizOrgCode());
+            model.setBizOrgName(orgUsr.getBizOrgName());
+        }
        /*bug 3098 联动专家，编辑时领域选择子分类保存，领域数据未修改 chenzhao 2021-10-14 */
         model.setSequenceNbr(sequenceNbr);
         if (model.getExpertCode() != null){
@@ -176,7 +197,7 @@ public class FireExpertsController extends BaseController {
         }
         /*  修改bug ： 4827  结束*/
         Page<FireExpertsDto> fireExpertsDtoPage = fireExpertsServiceImpl.queryForFireExpertsPage1(page, false,
-                fireExpertsDto.getName(), expertCodeArr);
+                fireExpertsDto.getName(), expertCodeArr, fireExpertsDto.getBizOrgCode());
         List<FireExpertsDto> fireExpertsDtoList = fireExpertsDtoPage.getRecords().stream().map(item -> {
             item.setAge(DateUtils.getAge(item.getBirthdayTime()));
             return item;
@@ -194,7 +215,7 @@ public class FireExpertsController extends BaseController {
     @ApiOperation(httpMethod = "GET", value = "列表全部数据查询", notes = "列表全部数据查询")
     @GetMapping(value = "/list")
     public ResponseModel<List<FireExpertsDto>> selectForList() {
-        List<FireExpertsDto> fireExpertsDtoList = fireExpertsServiceImpl.queryForFireExpertsList(false,null,null);
+        List<FireExpertsDto> fireExpertsDtoList = fireExpertsServiceImpl.queryForFireExpertsList(false,null,null, null);
         fireExpertsDtoList.stream().map(item -> {
             item.setAge(DateUtils.getAge(item.getBirthdayTime()));
             return item;
@@ -206,13 +227,13 @@ public class FireExpertsController extends BaseController {
     @TycloudOperation(ApiLevel = UserType.AGENCY)
     @RequestMapping(value = "/getExpertsTree", method = RequestMethod.GET)
     @ApiOperation(httpMethod = "GET", value = "获取专家领域树", notes = "获取专家领域树")
-    public ResponseModel<Object> getExpertsTree() throws Exception {
+    public ResponseModel<Object> getExpertsTree(@RequestParam(required = false) String bizOrgCode) throws Exception {
 //        String type = "ZJLY";
 //        QueryWrapper<DataDictionary> queryWrapper = new QueryWrapper<>();
 //        queryWrapper.eq("type", type);
 //        queryWrapper.orderByAsc("sort_num");
 
-        Collection<DataDictionary> list = dataDictionaryService.getDataDictionaryAndCount();
+        Collection<DataDictionary> list = dataDictionaryService.getDataDictionaryAndCount(bizOrgCode);
         list.forEach(i->{
         	i.setName(i.getName()+" ("+i.getCount()+")");
         });

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

@@ -2,6 +2,11 @@ package com.yeejoin.amos.boot.module.common.biz.controller;
 
 import java.util.List;
 
+import com.yeejoin.amos.boot.biz.common.bo.ReginParams;
+import com.yeejoin.amos.boot.module.common.api.entity.OrgUsr;
+import com.yeejoin.amos.boot.module.common.api.mapper.OrgUsrMapper;
+import org.apache.commons.lang3.ObjectUtils;
+import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.DeleteMapping;
 import org.springframework.web.bind.annotation.GetMapping;
@@ -44,6 +49,10 @@ public class LinkageUnitController extends BaseController {
     @Autowired
     ILinkageUnitService linkageUnitService;
 
+
+    @Autowired
+    private OrgUsrMapper orgUsrMapper;
+
     /**
      * 新增联动单位
      *
@@ -53,6 +62,13 @@ public class LinkageUnitController extends BaseController {
     @PostMapping(value = "/save")
     @ApiOperation(httpMethod = "POST", value = "新增联动单位", notes = "新增联动单位")
     public ResponseModel<LinkageUnitDto> save(@RequestBody LinkageUnitDto model) {
+        ReginParams reginParams = getSelectedOrgInfo();
+        String companyId = reginParams.getPersonIdentity().getCompanyId();
+        if (StringUtils.isNotEmpty(companyId)) {
+            OrgUsr orgUsr = orgUsrMapper.queryBySequenceNbr(companyId);
+            model.setBizOrgCode(orgUsr.getBizOrgCode());
+            model.setBizOrgName(orgUsr.getBizOrgName());
+        }
         model = linkageUnitServiceImpl.saveModel(model);
         return ResponseHelper.buildResponse(model);
     }
@@ -68,6 +84,13 @@ public class LinkageUnitController extends BaseController {
     @ApiOperation(httpMethod = "PUT", value = "根据sequenceNbr更新联动单位", notes = "根据sequenceNbr更新联动单位")
     public ResponseModel<LinkageUnitDto> updateBySequenceNbrLinkageUnit(@RequestBody LinkageUnitDto model,
                                                                         @PathVariable(value = "sequenceNbr") Long sequenceNbr) {
+        ReginParams reginParams = getSelectedOrgInfo();
+        String companyId = reginParams.getPersonIdentity().getCompanyId();
+        if (StringUtils.isNotEmpty(companyId)) {
+            OrgUsr orgUsr = orgUsrMapper.queryBySequenceNbr(companyId);
+            model.setBizOrgCode(orgUsr.getBizOrgCode());
+            model.setBizOrgName(orgUsr.getBizOrgName());
+        }
         model.setSequenceNbr(sequenceNbr);
         return ResponseHelper.buildResponse(linkageUnitServiceImpl.updateById(model));
     }
@@ -122,12 +145,20 @@ public class LinkageUnitController extends BaseController {
     @GetMapping(value = "/page")
     @ApiOperation(httpMethod = "GET", value = "联动单位分页查询", notes = "联动单位分页查询")
     public ResponseModel<Page<LinkageUnitDto>> queryForPage(@RequestParam(value = "current") int current, @RequestParam
-            (value = "size") int size, String unitName,String linkageUnitTypeCode, String linkageUnitType, String inAgreement, String emergencyLinkageUnitCode) {
+            (value = "size") int size, String unitName,String linkageUnitTypeCode, String linkageUnitType, String inAgreement, String emergencyLinkageUnitCode,
+                                                            @RequestParam(required = false) String bizOrgCode,
+                                                            @RequestParam(required = false) String companyCode) {
+        if (StringUtils.isNotEmpty(companyCode)) {
+            OrgUsr orgUsr = orgUsrMapper.queryByCompanyCode(companyCode);
+            if (ObjectUtils.isNotEmpty(orgUsr)) {
+                bizOrgCode = orgUsr.getBizOrgCode();
+            }
+        }
     	Page<LinkageUnitDto> page = new Page<LinkageUnitDto>();
         page.setCurrent(current);
         page.setSize(size);
     	Page<LinkageUnitDto> linkageUnitDtoPage = linkageUnitServiceImpl.queryForLinkageUnitPage(page, false,
-                unitName, linkageUnitTypeCode,linkageUnitType, emergencyLinkageUnitCode,inAgreement);
+                unitName, linkageUnitTypeCode,linkageUnitType, emergencyLinkageUnitCode,inAgreement, bizOrgCode);
         return ResponseHelper.buildResponse(linkageUnitDtoPage);
     }
 
@@ -150,7 +181,7 @@ public class LinkageUnitController extends BaseController {
     @TycloudOperation(ApiLevel = UserType.AGENCY)
     @ApiOperation(httpMethod = "GET", value = "联动单位列表树及统计", notes = "联动单位列表树及统计")
     @GetMapping(value = "/getLinkageUnitTree")
-    public ResponseModel<Object> getLinkageUnitTree(@RequestParam String type, @RequestParam String rootName) {
-        return ResponseHelper.buildResponse(linkageUnitService.getEmergencyLinkageUnitCodeGroupBy(type,rootName));
+    public ResponseModel<Object> getLinkageUnitTree(@RequestParam String type, @RequestParam String rootName, @RequestParam(required = false) String bizOrgCode) {
+        return ResponseHelper.buildResponse(linkageUnitService.getEmergencyLinkageUnitCodeGroupBy(type,rootName, bizOrgCode));
     }
 }

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

@@ -866,6 +866,15 @@ public class OrgUsrController extends BaseController {
 		return ResponseHelper.buildResponse(menus);
 	}
 
+	@PersonIdentify
+	@TycloudOperation(ApiLevel = UserType.AGENCY)
+	@RequestMapping(value = "/companyTreeAll", method = RequestMethod.GET)
+	@ApiOperation(httpMethod = "GET", value = "全量公司部门树", notes = "全量公司部门树")
+	public ResponseModel<List<OrgMenuDto>> companyTreeAll(@RequestParam(required = false) String orgType) {
+		List<OrgMenuDto> menus = iOrgUsrService.companyTreeAll(orgType);
+		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/FireExpertsServiceImpl.java

@@ -28,9 +28,9 @@ public class FireExpertsServiceImpl extends BaseService<FireExpertsDto, FireExpe
 	@Override
 	public Page<FireExpertsDto> queryForFireExpertsPage1(Page<FireExpertsDto> page,
 			@Condition(Operator.eq) Boolean isDelete, @Condition(Operator.like) String name,
-			@Condition(Operator.in) List<String> expertCode) {
+			@Condition(Operator.in) List<String> expertCode, @Condition(Operator.likeRight) String bizOrgCode) {
 		// 消防专家按时间倒叙排列add rec_date 2021-09-08 by kongfm
-		return this.queryForPage(page, "rec_date", false, isDelete, name, expertCode);
+		return this.queryForPage(page, "rec_date", false, isDelete, name, expertCode, bizOrgCode);
 	}
 
 	/**
@@ -39,22 +39,22 @@ public class FireExpertsServiceImpl extends BaseService<FireExpertsDto, FireExpe
 	@Override
 	public Page<FireExpertsDto> queryForFireExpertsPage(Page<FireExpertsDto> page,
 			@Condition(Operator.eq) Boolean isDelete, @Condition(Operator.like) String name,
-			@Condition(Operator.eq) String expertCode) {
+			@Condition(Operator.eq) String expertCode, @Condition(Operator.likeRight) String bizOrgCode) {
 		// 消防专家按时间倒叙排列add rec_date 2021-09-08 by kongfm
-		return this.queryForPage(page, "rec_date", false, isDelete, name, expertCode);
+		return this.queryForPage(page, "rec_date", false, isDelete, name, expertCode, bizOrgCode);
 	}
 
 	/**
 	 * 列表查询 示例
 	 */
 	public List<FireExpertsDto> queryForFireExpertsList(@Condition(Operator.eq) Boolean isDelete,
-			@Condition(Operator.like) String name, @Condition(Operator.eq) String expertCode) {
+			@Condition(Operator.like) String name, @Condition(Operator.eq) String expertCode, @Condition(Operator.likeRight) String bizOrgCode) {
 		if ("null".equals(name)) {
 			name = null;
 		}
 		if ("null".equals(expertCode)) {
 			expertCode = null;
 		}
-		return this.queryForList("", false, isDelete, name, expertCode);
+		return this.queryForList("", false, isDelete, name, expertCode, bizOrgCode);
 	}
 }

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

@@ -77,8 +77,9 @@ public class LinkageUnitServiceImpl extends BaseService<LinkageUnitDto, LinkageU
 			 Boolean isDelete, String unitName,
 			String linkageUnitTypeCode,
 			 String linkageUnitType,  String emergencyLinkageUnitCode,
-			String inAgreement) {
-		Page<List<LinkageUnitDto>> linkageUnitList = linkageUnitMapper.getEmergencyLinkageUnitList(page,unitName, linkageUnitType,linkageUnitTypeCode, emergencyLinkageUnitCode,inAgreement);
+			String inAgreement,
+														String bizOrgCode) {
+		Page<List<LinkageUnitDto>> linkageUnitList = linkageUnitMapper.getEmergencyLinkageUnitList(page,unitName, linkageUnitType,linkageUnitTypeCode, emergencyLinkageUnitCode,inAgreement, bizOrgCode);
 		List<Map> linkageUnitListMap =JSONArray.parseArray(JSONArray.toJSONString(linkageUnitList.getRecords()), Map.class);
 		
 		List<Map<String, Object>> pageList = dynamicFormInstanceService.listAll(getGroupCode());
@@ -275,8 +276,8 @@ public class LinkageUnitServiceImpl extends BaseService<LinkageUnitDto, LinkageU
 	}
 
 	@Override
-	public List<Menu> getEmergencyLinkageUnitCodeGroupBy(String type, String rootName) {
-		List<Map<String, Object>> map = linkageUnitMapper.getEmergencyLinkageUnitCodeGroupByAndCount();
+	public List<Menu> getEmergencyLinkageUnitCodeGroupBy(String type, String rootName, String bizOrgCode) {
+		List<Map<String, Object>> map = linkageUnitMapper.getEmergencyLinkageUnitCodeGroupByAndCount(bizOrgCode);
 
 		LambdaQueryWrapper<DataDictionary> queryWrapper = new LambdaQueryWrapper<DataDictionary>();
 		queryWrapper.eq(DataDictionary::getType, type);
@@ -306,7 +307,7 @@ public class LinkageUnitServiceImpl extends BaseService<LinkageUnitDto, LinkageU
 	}
 
 	@Override
-	public List<LinkageUnitDto> exportToExcel(String unitName,String linkageUnitTypeCode,String emergencyLinkageUnitCode) {
+	public List<LinkageUnitDto> exportToExcel(String unitName,String linkageUnitTypeCode,String emergencyLinkageUnitCode, String bizOrgCode) {
 		if ("null".equals(unitName)) {
 			unitName = null;
 		}
@@ -316,7 +317,10 @@ public class LinkageUnitServiceImpl extends BaseService<LinkageUnitDto, LinkageU
 		if ("null".equals(emergencyLinkageUnitCode)) {
 			emergencyLinkageUnitCode = null;
 		}
-		return linkageUnitMapper.exportToExcel(unitName,linkageUnitTypeCode,emergencyLinkageUnitCode );
+		if ("null".equals(bizOrgCode)) {
+			bizOrgCode = null;
+		}
+		return linkageUnitMapper.exportToExcel(unitName,linkageUnitTypeCode,emergencyLinkageUnitCode, bizOrgCode);
 	}
 
 }
\ 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

@@ -1749,6 +1749,14 @@ public class OrgUsrServiceImpl extends BaseService<OrgUsrDto, OrgUsr, OrgUsrMapp
 	}
 
 	@Override
+	public List<OrgMenuDto> companyTreeAll(String type) {
+		Map<String, Object> param = new HashMap<>();
+		param.put("type", type);
+		List<OrgUsr> list = orgUsrMapper.companyTreeByUserAndType(param);
+		return buildTreeParallel(list);
+	}
+
+	@Override
 	public List<OrgUsr> companyTreeByUserAndTypeNoTree(ReginParams reginParams, String type) {
 		Map<String, Object> param = new HashMap<>();
 		param.put("bizOrgCode", reginParams.getPersonIdentity().getBizOrgCode());

amos-boot-module/amos-boot-module-biz/amos-boot-module-jcs-biz/src/main/java/com/yeejoin/amos/boot/module/jcs/biz/service/impl/ExcelServiceImpl.java

@@ -12,6 +12,7 @@ import javax.servlet.http.HttpServletResponse;
 
 import com.yeejoin.amos.boot.module.common.api.dto.*;
 import com.yeejoin.amos.boot.module.common.api.excel.ExplicitConstraint;
+import com.yeejoin.amos.boot.module.common.api.mapper.OrgUsrMapper;
 import org.apache.commons.beanutils.ConvertUtils;
 import org.apache.poi.ss.usermodel.Cell;
 import org.apache.poi.ss.usermodel.Row;
@@ -177,6 +178,9 @@ public class ExcelServiceImpl {
 
 	@Autowired
 	DynamicFormInstanceServiceImpl dynamicFormInstanceService;
+
+	@Autowired
+	private OrgUsrMapper orgUsrMapper;
 	
 	public void templateExport(HttpServletResponse response, ExcelDto excelDto) throws ClassNotFoundException {
 		String url = excelDto.getClassUrl();
@@ -215,9 +219,9 @@ public class ExcelServiceImpl {
 		case "XFZJ":
 			List<FireExpertsDto> fireExpertsDtoList =null;
 			if(par.size()>0) {
-			  fireExpertsDtoList = fireExpertsServiceImpl.queryForFireExpertsList(false,par.containsKey("name")?par.get("name").toString():null,par.containsKey("expertCode")?par.get("expertCode").toString():null);
+			  fireExpertsDtoList = fireExpertsServiceImpl.queryForFireExpertsList(false,par.containsKey("name")?par.get("name").toString():null,par.containsKey("expertCode")?par.get("expertCode").toString():null,par.containsKey("bizOrgCode")?par.get("bizOrgCode").toString():null);
 			}else{
-				  fireExpertsDtoList = fireExpertsServiceImpl.queryForFireExpertsList(false,null,null);
+				  fireExpertsDtoList = fireExpertsServiceImpl.queryForFireExpertsList(false,null,null, null);
 			}
 			QueryWrapper<DataDictionary> queryWrapper = new QueryWrapper<>();
 			queryWrapper.eq("type", "XLLX");
@@ -345,10 +349,11 @@ public class ExcelServiceImpl {
 			if(par.size()>0) {
 				LinkageUnitDtoList = linkageUnitServiceImpl.exportToExcel(par.containsKey("unitName")?par.get("unitName").toString():null,
 						par.containsKey("linkageUnitTypeCode")?par.get("linkageUnitTypeCode").toString():null,
-						par.containsKey("emergencyLinkageUnitCode")?par.get("emergencyLinkageUnitCode").toString():null
+						par.containsKey("emergencyLinkageUnitCode")?par.get("emergencyLinkageUnitCode").toString():null,
+						par.containsKey("bizOrgCode")?par.get("bizOrgCode").toString():null
 						);
 			}else{
-				LinkageUnitDtoList = linkageUnitServiceImpl.exportToExcel(null,null,null);
+				LinkageUnitDtoList = linkageUnitServiceImpl.exportToExcel(null,null,null, null);
 			}
 
 			List<Map> linkageUnitListMap =JSONArray.parseArray(JSONArray.toJSONString(LinkageUnitDtoList), Map.class);
@@ -540,8 +545,18 @@ public class ExcelServiceImpl {
 
 	private void excelImportLinkageUnitZhDto(MultipartFile multipartFile) throws Exception {
 		List<LinkageUnitDto> excelDtoList = ExcelUtil.readFirstSheetExcel(multipartFile, LinkageUnitDto.class, 1);
-
+		ReginParams reginParams = JSONObject.parseObject(redisUtils.get(RedisKey.buildReginKey(RequestContext.getExeUserId(), RequestContext.getToken())).toString(), ReginParams.class);
+		String companyId = reginParams.getPersonIdentity().getCompanyId();
+		String bizOrgCode = "1";
+		String bizOrgName = "1";
+		if (org.apache.commons.lang3.StringUtils.isNotEmpty(companyId)) {
+			OrgUsr orgUsr = orgUsrMapper.queryBySequenceNbr(companyId);
+			bizOrgCode = orgUsr.getBizOrgCode();
+			bizOrgName = orgUsr.getBizOrgName();
+		}
 		if (excelDtoList != null && excelDtoList.size() > 0) {
+			String finalBizOrgCode = bizOrgCode;
+			String finalBizOrgName = bizOrgName;
 			excelDtoList.forEach(linkageUnitDto -> {
 				if (linkageUnitDto.getLinkageUnitType() != null) {
 					String[] certificates = linkageUnitDto.getLinkageUnitType().split("@");
@@ -554,6 +569,8 @@ public class ExcelServiceImpl {
 					linkageUnitDto.setEmergencyLinkageUnitCode(certificates[1]);
 				}
 				linkageUnitDto = Bean.toPo(getCurrentInfo(), linkageUnitDto);
+				linkageUnitDto.setBizOrgCode(finalBizOrgCode);
+				linkageUnitDto.setBizOrgName(finalBizOrgName);
 				linkageUnitServiceImpl.saveLinkageModel(linkageUnitDto);
 			});
 		}
@@ -1337,8 +1354,19 @@ public class ExcelServiceImpl {
 	}
 
 	private void excelImportFireExperts(MultipartFile multipartFile) throws Exception {
+		ReginParams reginParams = JSONObject.parseObject(redisUtils.get(RedisKey.buildReginKey(RequestContext.getExeUserId(), RequestContext.getToken())).toString(), ReginParams.class);
+		String companyId = reginParams.getPersonIdentity().getCompanyId();
+		String bizOrgCode = "1";
+		String bizOrgName = "1";
+		if (org.apache.commons.lang3.StringUtils.isNotEmpty(companyId)) {
+			OrgUsr orgUsr = orgUsrMapper.queryBySequenceNbr(companyId);
+			bizOrgCode = orgUsr.getBizOrgCode();
+			bizOrgName = orgUsr.getBizOrgName();
+		}
 		List<FireExpertsDto> excelDtoList = ExcelUtil.readFirstSheetExcel(multipartFile, FireExpertsDto.class, 1);
 		List<FireExperts> excelEntityList = new ArrayList<>();
+		String finalBizOrgCode = bizOrgCode;
+		String finalBizOrgName = bizOrgName;
 		excelDtoList.forEach(fireExpertsDto -> {
 			FireExperts fireExperts = new FireExperts();
 			fireExperts = Bean.toPo(fireExpertsDto, fireExperts);
@@ -1372,6 +1400,8 @@ public class ExcelServiceImpl {
 				fireExperts.setResidence(residenceDetailVal[1]);
 				fireExperts.setResidenceDetailVal(residenceDetailVal[0]);
 			}
+			fireExperts.setBizOrgCode(finalBizOrgCode);
+			fireExperts.setBizOrgName(finalBizOrgName);
 			excelEntityList.add(fireExperts);
 		});
 		fireExpertsServiceImpl.saveBatch(excelEntityList);
@@ -2004,7 +2034,7 @@ public class ExcelServiceImpl {
 //					FireChemicalDto.class, dataSourcesImpl, false);
 //			break;
 		case "XFZJ":
-			List<FireExpertsDto> fireExpertsDtoList = fireExpertsServiceImpl.queryForFireExpertsList(false,null,null);
+			List<FireExpertsDto> fireExpertsDtoList = fireExpertsServiceImpl.queryForFireExpertsList(false,null,null, null);
 			ExcelUtil.createTemplate(response, excelDto.getFileName(), excelDto.getSheetName(), fireExpertsDtoList,
 					FireExpertsDto.class, dataSourcesImpl, false);
 			break;

amos-boot-system-jcs/src/main/resources/db/changelog/jcs-1.0.0.0.xml

@@ -3288,5 +3288,33 @@
         </sql>
     </changeSet>
 
+    <changeSet author="zs" id="20220803-zs-1">
+        <preConditions onFail="MARK_RAN">
+            <not>
+                <columnExists tableName="cb_fire_experts" columnName="biz_org_code"/>
+            </not>
+        </preConditions>
+        <comment>modify table cb_fire_experts add columns</comment>
+        <sql>
+            ALTER TABLE `cb_fire_experts`
+            ADD biz_org_code varchar(1000) COLLATE utf8mb4_general_ci DEFAULT NULL COMMENT '机构编码',
+            ADD biz_org_name varchar(104) COLLATE utf8mb4_general_ci DEFAULT NULL COMMENT '机构/部门名称';
+        </sql>
+    </changeSet>
+
+    <changeSet author="zs" id="20220803-zs-2">
+        <preConditions onFail="MARK_RAN">
+            <not>
+                <columnExists tableName="cb_linkage_unit" columnName="biz_org_code"/>
+            </not>
+        </preConditions>
+        <comment>modify table cb_linkage_unit add columns</comment>
+        <sql>
+            ALTER TABLE `cb_linkage_unit`
+            ADD biz_org_code varchar(1000) COLLATE utf8mb4_general_ci DEFAULT NULL COMMENT '机构编码',
+            ADD biz_org_name varchar(104) COLLATE utf8mb4_general_ci DEFAULT NULL COMMENT '机构/部门名称';
+        </sql>
+    </changeSet>
+
 </databaseChangeLog>