diff --git a/lib/EmergencyService/zdxtEmergencyBootStart/src/main/resources/templates/project/code/enterprise_pub_qrcode/enterprisePubQrcodeList.html b/lib/EmergencyService/zdxtEmergencyBootStart/src/main/resources/templates/project/code/enterprise_pub_qrcode/enterprisePubQrcodeList.html index 375daf24..339979ef 100644 --- a/lib/EmergencyService/zdxtEmergencyBootStart/src/main/resources/templates/project/code/enterprise_pub_qrcode/enterprisePubQrcodeList.html +++ b/lib/EmergencyService/zdxtEmergencyBootStart/src/main/resources/templates/project/code/enterprise_pub_qrcode/enterprisePubQrcodeList.html @@ -118,6 +118,7 @@ showRefresh: false, showToggle: false, pageSize: 100, + pageList: [10, 25, 50,100], columns: [{ checkbox: true }, diff --git a/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/controller/EnterprisePubQrcodeController.java b/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/controller/EnterprisePubQrcodeController.java index c330e84f..03c28cee 100644 --- a/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/controller/EnterprisePubQrcodeController.java +++ b/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/controller/EnterprisePubQrcodeController.java @@ -71,9 +71,9 @@ public class EnterprisePubQrcodeController extends BaseController @ResponseBody public TableDataInfo list(EnterprisePubQrcode enterprisePubQrcode) { - startPage(); UserBean currentUser = userApi.getCurrentUser(); enterprisePubQrcode.setUserId(currentUser.getUserId()); + startPage(); List list = enterprisePubQrcodeService.selectEnterprisePubQrcodeList(enterprisePubQrcode); return getDataTable(list); }