From fb441acf2ec83c6594729ee7ffe3c5fea924e68c Mon Sep 17 00:00:00 2001
From: linfso <linfso@sina.com>
Date: Sun, 16 Jun 2024 22:01:33 +0800
Subject: [PATCH] md

---
 .../EmisSitePrepaidRechargeController.java    |  5 ++++-
 .../mapper/EmisSitePrepaidRechargeMapper.xml  | 19 +++++++++++++++++--
 2 files changed, 21 insertions(+), 3 deletions(-)

diff --git a/emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisSitePrepaidRechargeController.java b/emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisSitePrepaidRechargeController.java
index 7bdbeb175..ceb3f565e 100644
--- a/emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisSitePrepaidRechargeController.java
+++ b/emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisSitePrepaidRechargeController.java
@@ -43,7 +43,7 @@ import com.xdadan.erp.emis.service.IEmisSitePrepaidRechargeService;
  */
 @RestController
 @RequestMapping("/emis/emisSitePrepaidRecharge")
-public class EmisSitePrepaidRechargeController extends BaseController
+public class EmisSitePrepaidRechargeController extends EmisBaseController
 {
     @Autowired
     private IEmisSitePrepaidRechargeService emisSitePrepaidRechargeService;
@@ -56,6 +56,9 @@ public class EmisSitePrepaidRechargeController extends BaseController
     public TableDataInfo list(EmisSitePrepaidRecharge emisSitePrepaidRecharge)
     {
         startPage();
+
+        setPrivParams(emisSitePrepaidRecharge);
+
         List<EmisSitePrepaidRecharge> list = emisSitePrepaidRechargeService.selectEmisSitePrepaidRechargeList(emisSitePrepaidRecharge);
         return getDataTable(list);
     }
diff --git a/emis-biz/src/main/resources/mapper/EmisSitePrepaidRechargeMapper.xml b/emis-biz/src/main/resources/mapper/EmisSitePrepaidRechargeMapper.xml
index 0c1c3143b..943d4aac3 100644
--- a/emis-biz/src/main/resources/mapper/EmisSitePrepaidRechargeMapper.xml
+++ b/emis-biz/src/main/resources/mapper/EmisSitePrepaidRechargeMapper.xml
@@ -74,10 +74,25 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="updateSite != null  and updateSite != ''"> and  a.update_site like concat('%', #{updateSite}, '%')</if>
 
             <if test="params.beginCreateTime != null and params.beginCreateTime != ''">
-                and create_time <![CDATA[ >= ]]>  #{params.beginCreateTime}
+                and a.create_time <![CDATA[ >= ]]>  #{params.beginCreateTime}
             </if>
             <if test="params.endCreateTime != null and params.endCreateTime != ''">
-                and create_time <![CDATA[ <= ]]>  #{params.endCreateTime}
+                and a.create_time <![CDATA[ <= ]]>  #{params.endCreateTime}
+            </if>
+
+            <if test="params.privSiteCode != null and params.privSiteCode != '88888'">
+                and (
+                    a.recharge_site_code in (
+                    SELECT t1.site_code FROM (
+                    SELECT * FROM emis_site WHERE parent_site_code IS NOT NULL ) t1,( SELECT @pid :=
+                    #{params.privSiteCode} ) pd
+                    WHERE FIND_IN_SET( parent_site_code, @pid ) > 0 AND @pid := concat(@pid,',',site_code)
+                    UNION
+                    SELECT #{params.privSiteCode} FROM dual
+                    )
+                    or
+                    a.create_site =  #{params.privSiteCode}
+                )
             </if>
 
         </where>