From bda1153c2e149098782b6b25970a5aba0bb74640 Mon Sep 17 00:00:00 2001
From: tangzy <tangzy123456>
Date: Fri, 12 Nov 2021 09:15:28 +0800
Subject: [PATCH] 1.许可
---
src/main/java/org/springblade/modules/permit/controller/PermitController.java | 29 +++++++++++++++--------------
1 files changed, 15 insertions(+), 14 deletions(-)
diff --git a/src/main/java/org/springblade/modules/permit/controller/PermitController.java b/src/main/java/org/springblade/modules/permit/controller/PermitController.java
index d3733a1..56d9b55 100644
--- a/src/main/java/org/springblade/modules/permit/controller/PermitController.java
+++ b/src/main/java/org/springblade/modules/permit/controller/PermitController.java
@@ -127,20 +127,21 @@
@ApiOperation(value = "分页", notes = "传入permit")
public R<IPage<PermitVO>> page(PermitVO permit, Query query) {
IPage<PermitVO> pages;
- if (permit.getUsetype().equals("0")) {
- pages = permitService.selectPermitPage(Condition.getPage(query), permit, null);
- } else if (permit.getUsetype().equals("1")) {
- String childer = informationService.selJurchilder(permit.getJurisdiction());
- String[] split = childer.split(",");
- String strArrays = "";
- for (int j = 0; j < split.length; j++) {
- strArrays += "'" + split[j] + "',";
- }
- String jurisdiction = strArrays.substring(0, strArrays.length() - 1);
- pages = permitService.selectPermitPage(Condition.getPage(query), permit, jurisdiction);
- } else {
- pages = permitService.selectPermitPage(Condition.getPage(query), permit, null);
- }
+ pages = permitService.selectPermitPage(Condition.getPage(query), permit, permit.getJurisdiction());
+// if (permit.getUsetype().equals("0")) {
+// pages = permitService.selectPermitPage(Condition.getPage(query), permit, null);
+// } else if (permit.getUsetype().equals("1")) {
+// String childer = informationService.selJurchilder(permit.getJurisdiction());
+// String[] split = childer.split(",");
+// String strArrays = "";
+// for (int j = 0; j < split.length; j++) {
+// strArrays += "'" + split[j] + "',";
+// }
+// String jurisdiction = strArrays.substring(0, strArrays.length() - 1);
+// pages = permitService.selectPermitPage(Condition.getPage(query), permit, jurisdiction);
+// } else {
+// pages = permitService.selectPermitPage(Condition.getPage(query), permit, null);
+// }
return R.data(pages);
}
--
Gitblit v1.9.3