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

amos-boot-system-jxiop/amos-boot-module-hygf-biz/src/main/java/com/yeejoin/amos/boot/module/hygf/biz/service/impl/PersonnelBusinessServiceImpl.java

@@ -513,8 +513,8 @@ public class PersonnelBusinessServiceImpl extends BaseService<PersonnelBusinessD
             userDataJBDto.setUnallowModify("unallow");
         } else {
             // 有业务参与不可以编辑
-            userDataZHDto.setUnallowModify(hasOperationRecords ? "allow" : "unallow");
-            userDataJBDto.setUnallowModify(hasOperationRecords ? "allow" : "unallow");
+            userDataZHDto.setUnallowModify(hasOperationRecords ? "unallow" : "allow");
+            userDataJBDto.setUnallowModify(hasOperationRecords ? "unallow" : "allow");
         }
 
         return new UserDataDto( userDataZHDto, userDataJBDto ,  userDataZZDto);

amos-boot-system-jxiop/amos-boot-module-jxiop-bigscreen-biz/src/main/java/com/yeejoin/amos/boot/module/jxiop/biz/service/impl/EnergyAccessServiceImpl.java

@@ -201,10 +201,10 @@ public class EnergyAccessServiceImpl implements EnergyAccessService {
         });
         pageIPage.setTotal(returnList.size());
         int endIndex = newCurrent * newPageSize;
-        if (returnList.size() > endIndex) {
+        if (finalList.size() > endIndex) {
             pageIPage.setRecords(finalList.subList(((newCurrent - 1) * newPageSize), endIndex));
         } else {
-            pageIPage.setRecords(finalList.subList(((newCurrent - 1) * newPageSize), returnList.size()));
+            pageIPage.setRecords(finalList.subList(((newCurrent - 1) * newPageSize), finalList.size()));
         }
         logger.info("获取片区指标完成情况最终返回结果：{}", pageIPage.getRecords());
         return pageIPage;