Merge remote-tracking branch 'origin/develop' into release_temp

epmet-module/gov-issue/gov-issue-server/src/main/java/com/epmet/service/impl/IssueServiceImpl.java

@@ -1602,7 +1602,7 @@ public class IssueServiceImpl extends BaseServiceImpl<IssueDao, IssueEntity> imp
             throw new EpmetException("查询人员姓名失败...");
         }
         // 默认最多50 产品要求
-        Integer total = Integer.valueOf(String.valueOf(pageInfo.getTotal()));
+        Integer total = pageInfo.getSize();
         result.setTotal(total > NumConstant.FIFTY ? NumConstant.FIFTY : total);
         // 赋值展示名字
         list.forEach(l -> {

epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/IcBuildingServiceImpl.java

@@ -115,7 +115,7 @@ public class IcBuildingServiceImpl extends BaseServiceImpl<IcBuildingDao, IcBuil
     @Override
     public List<OptionResultDTO> getBuildingOptions(String neighborHoodId) {
         if (StringUtils.isBlank(neighborHoodId)) {
-            log.error("小区ID为空");
+            log.warn("小区ID为空");
             return Collections.emptyList();
         }
         LambdaQueryWrapper<IcBuildingEntity> wrapper = new LambdaQueryWrapper<>();

epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/IcBuildingUnitServiceImpl.java

@@ -115,7 +115,7 @@ public class IcBuildingUnitServiceImpl extends BaseServiceImpl<IcBuildingUnitDao
     @Override
     public List<OptionResultDTO> getUnitOptions(String buildingId) {
         if (StringUtils.isBlank(buildingId)) {
-            log.error("楼栋ID为空");
+            log.warn("楼栋ID为空");
             return Collections.emptyList();
         }
         LambdaQueryWrapper<IcBuildingUnitEntity> wrapper = new LambdaQueryWrapper<>();

epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/IcHouseServiceImpl.java

@@ -127,7 +127,7 @@ public class IcHouseServiceImpl extends BaseServiceImpl<IcHouseDao, IcHouseEntit
     @Override
     public List<OptionResultDTO> getHouseOption(HouseFormDTO formDTO) {
         if (StringUtils.isBlank(formDTO.getBuildingId()) && StringUtils.isBlank(formDTO.getUnitId())) {
-            log.error("楼栋和单元ID为空");
+            log.warn("楼栋和单元ID为空");
             return Collections.emptyList();
         }
         LambdaQueryWrapper<IcHouseEntity> wrapper = new LambdaQueryWrapper<>();