解决冲突

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

@@ -60,6 +60,9 @@ public class FirefightersServiceImpl extends BaseService<FirefightersDto, Firefi
 	FirefightersContactsServiceImpl ifirefightersContactsService;
 	@Autowired
 	private OrgUsrMapper orgUsrMapper;
+	@Autowired
+	OrgUsrAgencyUserMapper orgUsrAgencyUserMapper;
+
 
 	@Override
 	public List<FirefightersZhDto> getFirefighters(int pageNum, int pageSize, FirefightersDto par) {
@@ -314,7 +317,7 @@ public class FirefightersServiceImpl extends BaseService<FirefightersDto, Firefi
 
 	@Override
 	public void saveFirefightersByUser(PeopleInfoDto firefighters) {
-		orgUsrService.saveFirefighters(firefighters);
+		orgUsrService.saveFirefighters(firefighters,new HashMap<>());
 	}
 
 	public Map<String, String> getPersonByCodes(List<String> list) {

amos-boot-module/amos-boot-module-biz/amos-boot-module-equip-biz/src/main/java/com/yeejoin/equipmanage/controller/EquipmentManageController.java

@@ -62,7 +62,8 @@ public class EquipmentManageController extends AbstractBaseController{
             @RequestParam(value = "controBoxBuildId",required = false) String controBoxBuildId,
             @RequestParam(value = "current") int current,
             @RequestParam(value = "size") int pageSize,
-            @RequestParam(value = "companyId") String companyId
+            @RequestParam(value = "companyId") String companyId,
+            @RequestParam(required = false) String nameOrCode
 
     ) {
 
@@ -77,7 +78,7 @@ public class EquipmentManageController extends AbstractBaseController{
                 companyId = result.get("sequenceNbr").toString();
             }
         }
-            return equipmentManageService.queryEquipmenInfoAndCount(equipmentName,equipmentCode,construction,maintenance,bizOrgCode,formGroupId,current,pageSize,controBoxBuildId,companyId);
+            return equipmentManageService.queryEquipmenInfoAndCount(equipmentName,equipmentCode,construction,maintenance,bizOrgCode,formGroupId,current,pageSize,controBoxBuildId,companyId, nameOrCode);
     }
 
     @GetMapping(value = "/getUtils")

amos-boot-module/amos-boot-module-biz/amos-boot-module-equip-biz/src/main/java/com/yeejoin/equipmanage/controller/FireFightingSystemController.java

@@ -9,11 +9,13 @@ import com.alibaba.fastjson.JSONObject;
 import com.yeejoin.equipmanage.common.entity.*;
 import com.yeejoin.equipmanage.common.utils.SpringUtils;
 import com.yeejoin.equipmanage.fegin.JcsFeign;
+import io.swagger.annotations.ApiParam;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.context.annotation.Lazy;
 import org.springframework.http.MediaType;
 import org.springframework.scheduling.annotation.Async;
+import org.springframework.util.StringUtils;
 import org.springframework.web.bind.annotation.DeleteMapping;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.PathVariable;
@@ -538,9 +540,10 @@ public class FireFightingSystemController extends AbstractBaseController {
             @RequestParam(value = "maintenance", required = false) String maintenance,
             @RequestParam(value = "bizOrgCode", required = false) String bizOrgCode,
             @RequestParam(value = "formGroupId", required = false) String formGroupId,
+            @RequestParam(value = "controBoxBuildId", required = false) String controBoxBuildId,
             @RequestParam(value = "current") int current,
             @RequestParam(value = "size") int pageSize,
-            @RequestParam(value = "nameOrCode", required = false) String nameOrCode,
+            @RequestParam(value = "nameOrCode", required = false) String nameOrCode,  @RequestParam(value = "companyId",required = false) String companyId,
             @ApiParam(value = "缺陷管理新增页面用，其余地方可忽略 1-是缺陷管理 0-不是") @RequestParam(required = false) Integer isDefect
     ) {
         if (null != isDefect && 1 == isDefect) {

amos-boot-module/amos-boot-module-biz/amos-boot-module-equip-biz/src/main/java/com/yeejoin/equipmanage/service/IFireFightingSystemService.java

@@ -40,7 +40,7 @@ public interface IFireFightingSystemService extends IService<FireFightingSystemE
      * @param pageSize
      * @return
      */
-    Map<String, Object> queryEquipmenInfoAndCount(String equimentName, String equimentCode, String construction, String maintenance, String bizOrgCode, String formGroupId, int current, int pageSize, String nameOrCode);
+    Map<String, Object> queryEquipmenInfoAndCount(String equimentName, String equimentCode, String construction, String maintenance, String bizOrgCode, String formGroupId, int current, int pageSize,String controBoxBuildId,String companyId, String nameOrCode);
 
     FireFightingSystemEntity getOneById(Long id);
 

amos-boot-module/amos-boot-module-biz/amos-boot-module-equip-biz/src/main/java/com/yeejoin/equipmanage/service/impl/BuildingServiceImpl.java

@@ -1562,7 +1562,7 @@ public class BuildingServiceImpl extends ServiceImpl<BuildingMapper, Building> i
         //如果传递的为部门bizOrgCode 取其上级单位下的建筑
          ResponseModel<OrgUsrDto> companyByBizOrgCodeList = jcsFeign.getCompanyByBizOrgCodeList(bizOrgCode);
           String companyCode = companyByBizOrgCodeList.getResult().getBizOrgCode();
-        List<BuildingTreeVo> buildingTreeVos = this.getBuildingTreeVos(true);
+        List<BuildingTreeVo> buildingTreeVos = this.getBuildingTreeVos(true, bizOrgCode);
         List<BuildingTreeVo> orgBuildingTreeVos = buildingTreeVos.stream().filter(b-> b.getBizOrgCode() != null && b.getBizOrgCode().startsWith(companyCode)).collect(Collectors.toList());
 
 
@@ -1577,7 +1577,7 @@ public class BuildingServiceImpl extends ServiceImpl<BuildingMapper, Building> i
         //如果传递的为部门bizOrgCode 取其上级单位下的建筑
         ResponseModel<OrgUsrDto> companyByBizOrgCodeList = jcsFeign.getCompanyByBizOrgCodeList(bizOrgCode);
         String companyCode = companyByBizOrgCodeList.getResult().getBizOrgCode();
-        List<BuildingTreeVo> buildingTreeVos = this.getBuildingTreeVos(true);
+        List<BuildingTreeVo> buildingTreeVos = this.getBuildingTreeVos(true, bizOrgCode);
         List<BuildingTreeVo> orgBuildingTreeVos = buildingTreeVos.stream().filter(b-> b.getBizOrgCode() != null && b.getBizOrgCode().startsWith(companyCode)).collect(Collectors.toList());
         return orgBuildingTreeVos;
     }

amos-boot-module/amos-boot-module-biz/amos-boot-module-equip-biz/src/main/java/com/yeejoin/equipmanage/service/impl/EquipmentManageServiceImpl.java

@@ -56,7 +56,7 @@ public class EquipmentManageServiceImpl extends ServiceImpl<EquipmentManageMappe
 
     @Override
     public Map<String, Object> queryEquipmenInfoAndCount(String equimentName, String equimentCode, String construction, String maintenance,
-                                                         String bizOrgCode, String formGroupId, int current, int pageSize) {
+                                                         String bizOrgCode, String formGroupId, int current, int pageSize,String controBoxBuildId,String companyCode, String nameOrCode) {
         HttpServletRequest request = null;
         Map map = new HashMap<String, Object>();
         map.put("equimentName", equimentName);