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/services/User_infService.java |   28 +++++++---------------------
 1 files changed, 7 insertions(+), 21 deletions(-)

diff --git a/src/main/java/com/fgkj/services/User_infService.java b/src/main/java/com/fgkj/services/User_infService.java
index 8315022..46a8dab 100644
--- a/src/main/java/com/fgkj/services/User_infService.java
+++ b/src/main/java/com/fgkj/services/User_infService.java
@@ -83,7 +83,7 @@
 		return model;
 	}
 	
-	public ServiceModel serchByCondition(Object obj) {
+	public ServiceModel serchByCondition(User_inf obj) {
 		List list = mapper.serchByCondition(obj);
 		/*
 		 * for (Object object : list) { System.out.println(object); }
@@ -99,9 +99,6 @@
 
 	public ServiceModel searchAll() {
 		List<User_inf> list = mapper.searchAll();
-		/*
-		 * for (User_inf u : list) { System.out.println(u); }
-		 */
 
 		if (list != null && list.size() > 0) {
 			model.setCode(1);
@@ -158,36 +155,25 @@
 	}
 
 	// 5.1鏌ヨ鍛樺伐鐨勬墍鏈変俊鎭�
-	public ServiceModel searchAll2(Batt_User_Permit bup) {
-		// System.out.println((Batt_User_Permit)obj);
+	public ServiceModel searchAll(Batt_User_Permit bup) {
 		ServiceModel model = new ServiceModel();
+		//鍒嗛〉
+		PageBean pageBean = bup.getPageBean();
+		PageHelper.startPage(pageBean.getPageNum(),pageBean.getPageSize(),true);
 		List<Batt_User_Permit> list = mapper.searchAll2(bup);// 瀛樻斁鐨勬槸鍛樺伐淇℃伅
-		List<Batt_User_Permit> listd =new ArrayList<>();
-		int index=0;
-		for(int i=(bup.getPageBean().getPageCurr()-1)*bup.getPageBean().getPageSize();i<bup.getPageBean().getPageSize()*bup.getPageBean().getPageCurr()&&i<list.size();i++){
-
-//			listd.add((Batt_User_Permit) list.get(i));
-			Batt_User_Permit batt_user_permit = list.get(i);
-			batt_user_permit.setPageBean(new PageBean());
-			listd.add(batt_user_permit);
-			System.out.println(list.get(i));
-			((Batt_User_Permit)listd.get(index++)).getPageBean().setPageAll(list.size());
-		}
-		list=listd;
-
 		if (list != null && list.size() > 0) {
 			model.setCode(1);
 			for (int i = 0; i < list.size(); i++) {
 				ServiceModelImpl model1 = upservice.serchByCondition(list.get(i).getUinf());// 瀛樻斁鏉冮檺
 				// System.out.println(model1.getMsgN());
 				if (model1.getCode() > 0) {
-					//TODO perry
 					 list.get(i).getUinf().setPermitgroupName(model1.getMsgN());
 				} else {
 					list.get(i).getUinf().setPermitgroupName("");
 				}
 			}
-			model.setData(list);
+			PageInfo<Batt_User_Permit> pageInfo = new PageInfo<>(list);
+			model.setData(pageInfo);
 		}
 		// System.out.println(model);
 		return model;

--
Gitblit v1.9.1