Merge remote-tracking branch 'origin/develop_dl' into develop_dl

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

@@ -35,6 +35,7 @@ import com.yeejoin.amos.boot.module.common.api.mapper.OrgUsrMapper;
 import com.yeejoin.amos.boot.module.common.api.service.IDataSyncService;
 import com.yeejoin.amos.boot.module.common.api.service.IMaintenanceCompanyService;
 import com.yeejoin.amos.boot.module.common.api.service.IOrgUsrService;
+import com.yeejoin.amos.component.feign.config.InnerInvokException;
 import com.yeejoin.amos.component.feign.model.FeignClientResult;
 import com.yeejoin.amos.feign.privilege.Privilege;
 import com.yeejoin.amos.feign.privilege.model.AgencyUserModel;
@@ -767,8 +768,12 @@ public class OrgUsrServiceImpl extends BaseService<OrgUsrDto, OrgUsr, OrgUsrMapp
 		Map<String, AgencyUserModel> collect = new HashMap<>();
 		if (CollectionUtils.isNotEmpty(amosIds)) {
 			String join = String.join(",", amosIds);
-			List<AgencyUserModel> amosUser = Privilege.agencyUserClient.queryByIds(join, false).getResult();
-			collect = amosUser.stream().collect(Collectors.toMap(AgencyUserModel::getUserId, t -> t));
+			try {
+				List<AgencyUserModel> amosUser = Privilege.agencyUserClient.queryByIds(join, false).getResult();
+				collect = amosUser.stream().collect(Collectors.toMap(AgencyUserModel::getUserId, t -> t));
+			} catch (InnerInvokException e) {
+				throw new RuntimeException("未查询到人员信息，请检查！");
+			}
 		}
 		Map<String, AgencyUserModel> finalCollect = collect;
 		list.forEach(t -> {

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

@@ -864,6 +864,10 @@ public class BuildingServiceImpl extends ServiceImpl<BuildingMapper, Building> i
     public Page buildingList(Page page, BuildSearchDTO dto) {
         Optional.ofNullable(dto.getInstanceId()).orElseThrow(() -> new BadRequest("instanceId参数不能为空"));
         Optional.ofNullable(dto.getGroupType()).orElseThrow(() -> new BadRequest("groupType参数不能为空"));
+        // 由于前端并未使用分页组件，导致展示不全，所以未免产生歧义此处展示所有
+        if ("allBuilding".equalsIgnoreCase(dto.getGroupType())) {
+            page.setSize(1000);
+        }
         // 根据不同的groupType 查询分页
         PageOperation targetOperation = PageOperatorFactory
                 .getOperation(dto.getGroupType())

amos-boot-module/amos-boot-module-biz/amos-boot-module-patrol-biz/src/main/java/com/yeejoin/amos/patrol/business/controller/CheckController.java

@@ -978,7 +978,7 @@ public class CheckController extends AbstractBaseController {
         param.setUserId(userId);
         ReginParams reginParams = getSelectedOrgInfo();
         param.setOrderBy("checkDate desc");
-        param.setBizOrgCode(ObjectUtils.isEmpty(param.getBizOrgCode()) ? reginParams.getPersonIdentity().getBizOrgCode() : param.getBizOrgCode());
+//        param.setBizOrgCode(ObjectUtils.isEmpty(param.getBizOrgCode()) ? reginParams.getPersonIdentity().getBizOrgCode() : param.getBizOrgCode());
         CommonPageable commonPageable = new CommonPageable();
         commonPageable.setPageNumber(pageNumber);
         commonPageable.setPageSize(pageSize);

amos-boot-system-equip/src/main/resources/mapper/FireFightingSystemMapper.xml

@@ -6100,7 +6100,7 @@
             ) AS total,
 
             (select
-            count(sequence_nbr)fire-resource-superv
+            count(sequence_nbr)
             from
             cb_water_resource
             <where>

amos-boot-system-patrol/src/main/resources/db/mapper/dbTemplate_check.xml

@@ -438,7 +438,7 @@
         FROM
         `p_check` `a`
         <trim prefix="WHERE" prefixOverrides="AND ">
-            <if test="userId!=null and userId!=''">and find_in_set(#{userId}, a.user_id) > 0</if>
+            <if test="userId!=null and userId!=''">and a.user_id = #{userId}</if>
             <if test="bizOrgCode != null and bizOrgCode != ''">
                 and  a.org_code LIKE CONCAT(#{bizOrgCode},'%')
             </if>
@@ -471,7 +471,7 @@
         `p_check` `a`
         <trim prefix="WHERE" prefixOverrides="AND ">
             `a`.`is_ok` != 1
-            <if test="userId!=null and userId!=''">and find_in_set(#{userId}, a.user_id) > 0</if>
+            <if test="userId!=null and userId!=''">and a.user_id = #{userId}</if>
             <if test="bizOrgCode != null and bizOrgCode != ''">
                 and a.org_code LIKE CONCAT(#{bizOrgCode},'%')
             </if>