From 75ef4de1c55e6029fbd2b37ee3b52665c9135b5f Mon Sep 17 00:00:00 2001
From: Administrator <admin>
Date: Wed, 15 Dec 2021 15:27:41 +0800
Subject: [PATCH] 1. 派遣查询修改 2. 车辆定位接口修改，会报空指针 3. 日志输出修改管理 4. 证书导出Png图片不显示bug修复
---
src/main/java/org/springblade/modules/revoke/controller/RevokeController.java | 29 +++++++++++++++--------------
1 files changed, 15 insertions(+), 14 deletions(-)
diff --git a/src/main/java/org/springblade/modules/revoke/controller/RevokeController.java b/src/main/java/org/springblade/modules/revoke/controller/RevokeController.java
index 86eb79b..a309645 100644
--- a/src/main/java/org/springblade/modules/revoke/controller/RevokeController.java
+++ b/src/main/java/org/springblade/modules/revoke/controller/RevokeController.java
@@ -85,20 +85,21 @@
@ApiOperation(value = "分页", notes = "传入revoke")
public R<IPage<RevokeVO>> page(RevokeVO revoke, Query query) {
IPage<RevokeVO> pages;
- if (revoke.getUsetype().equals("0")) {
- pages = revokeService.selectRevokePage(Condition.getPage(query), revoke,null);
- } else if (revoke.getUsetype().equals("1")) {
- String childer = informationService.selJurchilder(revoke.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 =revokeService.selectRevokePage(Condition.getPage(query), revoke,jurisdiction);
- } else {
- pages =revokeService.selectRevokePage(Condition.getPage(query), revoke,null);
- }
+ pages =revokeService.selectRevokePage(Condition.getPage(query), revoke,revoke.getJurisdiction());
+// if (revoke.getUsetype().equals("0")) {
+// pages = revokeService.selectRevokePage(Condition.getPage(query), revoke,null);
+// } else if (revoke.getUsetype().equals("1")) {
+// String childer = informationService.selJurchilder(revoke.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 =revokeService.selectRevokePage(Condition.getPage(query), revoke,jurisdiction);
+// } else {
+// pages =revokeService.selectRevokePage(Condition.getPage(query), revoke,null);
+// }
return R.data(pages);
}
--
Gitblit v1.9.3