Merge branch 'developer' of http://172.16.10.76/moa/amos-boot-biz into developer

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

@@ -634,6 +634,9 @@ public class MaintenanceCompanyServiceImpl
 		}
 		MaintenanceCompany person = this.getOne(new LambdaQueryWrapper<MaintenanceCompany>()
 				.eq(MaintenanceCompany::getInstanceId, dyFormInstance.getInstanceId()));
+		if (ValidationUtil.isEmpty(person)) {
+			throw new BadRequest("维保账号不存在或未关联系统账号.");
+		}
 		maintenanceCompany = this.getOne(new LambdaQueryWrapper<MaintenanceCompany>()
 				.eq(MaintenanceCompany::getSequenceNbr, person.getParentId()));
 		if (ValidationUtil.isEmpty(maintenanceCompany)) {

amos-boot-module/amos-boot-module-biz/amos-boot-module-latentdanger-biz/src/main/java/com/yeejoin/amos/latentdanger/business/param/PageParam.java

 package com.yeejoin.amos.latentdanger.business.param;
 
-import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.baomidou.mybatisplus.core.metadata.OrderItem;
 import org.springframework.data.domain.Pageable;
 import org.springframework.data.domain.Sort;
+import org.typroject.tyboot.core.foundation.utils.ValidationUtil;
 
 import java.util.HashMap;
-import java.util.List;
 
 /**
  * @author DELL
@@ -107,4 +105,15 @@ public class PageParam<K, V> extends HashMap<K, V> implements Pageable {
     public boolean hasPrevious() {
         return false;
     }
+
+    public int getParamCurrent() {
+        if (!ValidationUtil.isEmpty(this.get("current"))) {
+            return current;
+        }
+        if (this.get("current") instanceof String && this.get("size") instanceof String) {
+            return Integer.parseInt((String) this.get("current"));
+        } else {
+            return (Integer)(this.get("current"));
+        }
+    }
 }

amos-boot-module/amos-boot-module-biz/amos-boot-module-latentdanger-biz/src/main/java/com/yeejoin/amos/latentdanger/business/service/impl/LatentDangerServiceImpl.java

@@ -1814,20 +1814,19 @@ public class LatentDangerServiceImpl extends BaseService<LatentDangerBo, LatentD
             pageParam.put("dangerIds", dangerIdList);
         }
         Page page = new Page();
-        if (pageParam.get("current") instanceof String && pageParam.get("size") instanceof String) {
-            int current = Integer.valueOf((String) pageParam.get("current"));
-            int size = Integer.valueOf((String) pageParam.get("current"));
-            page.setCurrent(current);
-            page.setSize(size);
-        } else {
-            page.setCurrent((Integer)(pageParam.get("current")));
-            page.setSize((Integer)(pageParam.get("size")));
-        }
+        initPage(pageParam, page);
+
         if (ValidationUtil.isEmpty(pageParam.get("order"))) {
             pageParam.put("order", "1");
         }
 
         IPage<LatentDanger> iPage = this.baseMapper.selectPageByParam(page, (Map<String, Object>) pageParam);
+        if (iPage.getCurrent() != pageParam.getParamCurrent()) {
+            iPage.setRecords(Lists.newArrayList());
+            iPage.setTotal(0);
+            iPage.setCurrent(pageParam.getParamCurrent());
+            return iPage;
+        }
         Map<String, Object> buildingAbsolutePositionMap = new HashMap<>();
         if (!ValidationUtil.isEmpty(iPage.getRecords())) {
             try {
@@ -1866,6 +1865,18 @@ public class LatentDangerServiceImpl extends BaseService<LatentDangerBo, LatentD
         return iPage;
     }
 
+    public void initPage(PageParam pageParam, Page page) {
+        if (pageParam.get("current") instanceof String && pageParam.get("size") instanceof String) {
+            int current = Integer.valueOf((String) pageParam.get("current"));
+            int size = Integer.valueOf((String) pageParam.get("size"));
+            page.setCurrent(current);
+            page.setSize(size);
+        } else {
+            page.setCurrent((Integer)(pageParam.get("current")));
+            page.setSize((Integer)(pageParam.get("size")));
+        }
+    }
+
     private List<Map<String, Object>> getAllNodes(List<Map<String, Object>> buildingTree) {
         List<Map<String, Object>> res = new LinkedList<>();
         if (buildingTree != null && !buildingTree.isEmpty()) {