From cc057177b2fb17aee9a173a6adbabdc578fd74c7 Mon Sep 17 00:00:00 2001
From: tangzy <tangzy123456>
Date: Mon, 06 Dec 2021 10:30:44 +0800
Subject: [PATCH] 1.许可

---
 src/main/java/org/springblade/modules/dispatcher/controller/DispatcherController.java |   15 ++++++++++++++-
 1 files changed, 14 insertions(+), 1 deletions(-)

diff --git a/src/main/java/org/springblade/modules/dispatcher/controller/DispatcherController.java b/src/main/java/org/springblade/modules/dispatcher/controller/DispatcherController.java
index 3a6a90f..bcd4cb9 100644
--- a/src/main/java/org/springblade/modules/dispatcher/controller/DispatcherController.java
+++ b/src/main/java/org/springblade/modules/dispatcher/controller/DispatcherController.java
@@ -96,6 +96,17 @@
 	}
 
 	/**
+	 * APP-从业单位查询(派遣单位)
+	 */
+	@GetMapping("/queryDispatcher")
+	@ApiOperationSupport(order = 3)
+	@ApiOperation(value = "分页", notes = "传入dispatcher")
+	public R<IPage<DispatcherVO>> queryDispatcher(DispatcherVO dispatcher, Query query) {
+		IPage<DispatcherVO> pages = dispatcherService.queryDispatcher(Condition.getPage(query), dispatcher);
+		return R.data(pages);
+	}
+
+	/**
 	 * 新增
 	 */
 	@PostMapping("/save")
@@ -243,8 +254,10 @@
 						"update blade_user set dispatch = " + "'" + user1.getDispatch() + "'" +
 							" " +"where id = " + "'" + user1.getId() + "'";
 					FtpUtil.sqlFileUpload(s1);
+				}else {
+					//修改
+					status = dispatcherService.updateById(dispatcher);
 				}
-
 		}
 		return R.status(status);
 	}

--
Gitblit v1.9.3