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/DynamicFormInstanceServiceImpl.java

@@ -134,7 +134,11 @@ public class DynamicFormInstanceServiceImpl extends BaseService<DynamicFormInsta
         Map<String, String> params = this.getRequestParamMap();
         List<DynamicFormColumn> columns = dynamicFormColumnService.list(new LambdaQueryWrapper<DynamicFormColumn>().eq(DynamicFormColumn::getGroupCode, groupCode));
         Map<String, Object> fieldCodes = Bean.listToMap(columns, "fieldCode", "queryStrategy", DynamicFormColumn.class);
-        Page page = new Page(current, size);
+        Page page = new Page();
+        if (current > 0){
+            page.setCurrent((long) (current - 1) *size);
+            page.setSize(size);
+        }
         return this.getBaseMapper().pageList(page, RequestContext.getAppKey(), fieldCodes, groupCode, params);
     }
     // 不存在值班数据则不查找 修改sql 方法去除 by kongfm 2021-09-14