From d53adee4a7c5e9fd5c83deb0b783eab97bbbabc7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=82=9D=E5=87=AF=E5=85=B4?= <985571137@qq.com>
Date: Wed, 27 Jul 2022 13:50:52 +0800
Subject: [PATCH] =?UTF-8?q?update=20=E4=BC=81=E4=B8=9A=E7=AE=A1=E7=90=86?=
 =?UTF-8?q?=E5=91=98=E6=9D=A1=E4=BB=B6=E5=88=86=E9=A1=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../PayManagerManagementController.java       |  5 +-
 .../mapper/PayManagerManagementMapper.java    |  2 -
 .../mapper/xml/PayManagerManagementMapper.xml | 50 -------------------
 .../service/IPayManagerManagementService.java |  2 -
 .../impl/PayManagerManagementServiceImpl.java | 11 ----
 5 files changed, 3 insertions(+), 67 deletions(-)

diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/company/controller/PayManagerManagementController.java b/jero-boot-incoming-payment/src/main/java/com/jero/company/controller/PayManagerManagementController.java
index 463395de..b996745c 100644
--- a/jero-boot-incoming-payment/src/main/java/com/jero/company/controller/PayManagerManagementController.java
+++ b/jero-boot-incoming-payment/src/main/java/com/jero/company/controller/PayManagerManagementController.java
@@ -63,8 +63,9 @@ public class PayManagerManagementController extends JeroController<PayManagerMan
 								   @RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
 								   @RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
 								   HttpServletRequest req) {
-		Page<PayManagerManagement> pageList = new Page<>(pageNo, pageSize);
-		pageList = payManagerManagementService.queryWithCondition(pageList,payManagerManagement);
+		QueryWrapper<PayManagerManagement> queryWrapper = QueryGenerator.initQueryWrapper(payManagerManagement, req.getParameterMap());
+		Page<PayManagerManagement> page = new Page<>(pageNo, pageSize);
+		IPage<PayManagerManagement> pageList = payManagerManagementService.page(page, queryWrapper);
 		return Result.OK(pageList);
 	}
 
diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/company/mapper/PayManagerManagementMapper.java b/jero-boot-incoming-payment/src/main/java/com/jero/company/mapper/PayManagerManagementMapper.java
index 6f5b89d6..a47635b7 100644
--- a/jero-boot-incoming-payment/src/main/java/com/jero/company/mapper/PayManagerManagementMapper.java
+++ b/jero-boot-incoming-payment/src/main/java/com/jero/company/mapper/PayManagerManagementMapper.java
@@ -14,6 +14,4 @@ import java.util.List;
  * @Version: V1.0
  */
 public interface PayManagerManagementMapper extends BaseMapper<PayManagerManagement> {
-
-    List<PayManagerManagement> queryWtihCondition(Page<PayManagerManagement> page, @Param("manager")PayManagerManagement payManagerManagement);
 }
diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/company/mapper/xml/PayManagerManagementMapper.xml b/jero-boot-incoming-payment/src/main/java/com/jero/company/mapper/xml/PayManagerManagementMapper.xml
index 69ef01f2..7540350f 100644
--- a/jero-boot-incoming-payment/src/main/java/com/jero/company/mapper/xml/PayManagerManagementMapper.xml
+++ b/jero-boot-incoming-payment/src/main/java/com/jero/company/mapper/xml/PayManagerManagementMapper.xml
@@ -28,54 +28,4 @@
         <result column="member_id" property="memberId" />
     </resultMap>
 
-    <select id="queryWtihCondition" resultType="com.jero.company.entity.PayManagerManagement">
-        select * from pay_manager_management
-        <where>
-            <if test="manager.id != null and manager.id != ''">
-                and id =#{manager.id}
-            </if>
-            <if test="manager.companyId != null and manager.companyId != ''">
-                and company_id =#{manager.companyId}
-            </if>
-            <if test="manager.companyName != null and manager.companyName != ''">
-                and company_name =#{manager.companyName}
-            </if>
-            <if test="manager.name != null and manager.name != ''">
-                and name =#{manager.name}
-            </if>
-            <if test="manager.gender != null and manager.gender != ''">
-                and gender =#{manager.gender}
-            </if>
-            <if test="manager.post != null and manager.post != ''">
-                and post =#{manager.post}
-            </if>
-            <if test="manager.phone != null and manager.phone != ''">
-                and phone =#{manager.phone}
-            </if>
-            <if test="manager.email != null and manager.email != ''">
-                and email =#{manager.email}
-            </if>
-            <if test="manager.contactAddress != null and manager.contactAddress != ''">
-                and contact_address=#{manager.contactAddress}
-            </if>
-            <if test="manager.postalCode != null and manager.postalCode != ''">
-                and postal_code =#{manager.postalCode}
-            </if>
-            <if test="manager.createBy != null and manager.createBy != ''">
-                and create_by =#{manager.createBy}
-            </if>
-            <if test="manager.username != null and manager.username != ''">
-                and username =#{manager.username}
-            </if>
-            <if test="manager.roleCode != null and manager.roleCode != ''">
-                and role_code =#{manager.roleCode}
-            </if>
-            <if test="manager.memberNature != null and manager.memberNature != ''">
-                and member_nature=#{manager.memberNature}
-            </if>
-            <if test="manager.memberId != null and manager.memberId != ''">
-                and member_id =#{manager.memberId}
-            </if>
-        </where>
-    </select>
 </mapper>
diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/company/service/IPayManagerManagementService.java b/jero-boot-incoming-payment/src/main/java/com/jero/company/service/IPayManagerManagementService.java
index 783912fc..273783d1 100644
--- a/jero-boot-incoming-payment/src/main/java/com/jero/company/service/IPayManagerManagementService.java
+++ b/jero-boot-incoming-payment/src/main/java/com/jero/company/service/IPayManagerManagementService.java
@@ -50,6 +50,4 @@ public interface IPayManagerManagementService extends IService<PayManagerManagem
     void changePassword(CompanyManagerLoginVO companyManagerLoginVO);
 
 	void changePasswordWithToken(CompanyManagerLoginVO companyManagerLoginVO);
-
-    Page<PayManagerManagement> queryWithCondition(Page<PayManagerManagement> page, PayManagerManagement payManagerManagement);
 }
diff --git a/jero-boot-incoming-payment/src/main/java/com/jero/company/service/impl/PayManagerManagementServiceImpl.java b/jero-boot-incoming-payment/src/main/java/com/jero/company/service/impl/PayManagerManagementServiceImpl.java
index e2e91579..7e0866c4 100644
--- a/jero-boot-incoming-payment/src/main/java/com/jero/company/service/impl/PayManagerManagementServiceImpl.java
+++ b/jero-boot-incoming-payment/src/main/java/com/jero/company/service/impl/PayManagerManagementServiceImpl.java
@@ -1,7 +1,6 @@
 package com.jero.company.service.impl;
 
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.jero.common.exception.JeroBootException;
 import com.jero.common.system.api.ISysBaseAPI;
 import com.jero.common.system.util.JwtUtil;
@@ -35,8 +34,6 @@ public class PayManagerManagementServiceImpl extends ServiceImpl<PayManagerManag
 	private RedisUtil redisUtil;
 	@Resource
 	private ISysBaseAPI sysBaseAPI;
-	@Resource
-	private PayManagerManagementMapper payManagerManagementMapper;
 	/**
 	 * 保存
 	 *
@@ -211,12 +208,4 @@ public class PayManagerManagementServiceImpl extends ServiceImpl<PayManagerManag
 
 		updatePassword(newPassword,verifyPassword,phone);
 	}
-
-	@Override
-	public Page<PayManagerManagement> queryWithCondition(Page<PayManagerManagement> page, PayManagerManagement payManagerManagement) {
-		//TODO 手机号加密
-		List<PayManagerManagement> list= payManagerManagementMapper.queryWtihCondition(page,payManagerManagement);
-		page.setRecords(list);
-		return page;
-	}
 }