From d1491636bcc06c9bb23b4955c3d8d0bfe7749e6d Mon Sep 17 00:00:00 2001
From: whycrzh <ruanzhigang@whycst.com>
Date: 星期六, 23 一月 2021 13:58:33 +0800
Subject: [PATCH] update userInf.byCondition
---
src/main/java/com/fgkj/controller/User_infController.java | 18 +++++++-----------
1 files changed, 7 insertions(+), 11 deletions(-)
diff --git a/src/main/java/com/fgkj/controller/User_infController.java b/src/main/java/com/fgkj/controller/User_infController.java
index 3ea20cd..dc4b475 100644
--- a/src/main/java/com/fgkj/controller/User_infController.java
+++ b/src/main/java/com/fgkj/controller/User_infController.java
@@ -76,23 +76,19 @@
return model;
}
@GetMapping("byCondition")
- public ServiceModel serchByCondition() {
- ServiceModel model = new ServiceModel();
-
- //System.out.println(result);
- return model;
+ public ServiceModel serchByCondition(@RequestBody User_inf uif) {
+ return service.serchByCondition(uif);
}
@GetMapping("all")
public ServiceModel searchAll(@RequestBody Batt_User_Permit bup) {
ServiceModel model = new ServiceModel();
- if(bup==null){
- model=service.searchAll();
- }else{
- model = service.searchAll2(bup);
+ System.out.println("bup = " + bup);
+ if (bup.getPageBean() == null) {
+ model = service.searchAll();
+ } else {
+ model = service.searchAll(bup);
}
-
- //System.out.println(result);
return model;
}
//鏍规嵁鍛樺伐淇℃伅鍜屽憳宸ョ紪鍙峰幓鍖归厤鍚堥�傜殑鍛樺伐
--
Gitblit v1.9.1