From 8d192b60725bc8254bf79a58acecb34d4ebe7e78 Mon Sep 17 00:00:00 2001
From: linfso <linfso@sina.com>
Date: Wed, 5 Jun 2024 14:28:21 +0800
Subject: [PATCH] md

---
 .../erp/web/emis/EmisBaseController.java      | 12 +-----
 .../mapper/EmisTmsScanRecordMapper.xml        | 43 +++++++------------
 .../resources/mapper/EmisWaybillMapper.xml    | 12 +++++-
 3 files changed, 26 insertions(+), 41 deletions(-)

diff --git a/emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisBaseController.java b/emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisBaseController.java
index 6afc8ca01..33f083987 100644
--- a/emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisBaseController.java
+++ b/emis-biz-web/src/main/java/com/xdadan/erp/web/emis/EmisBaseController.java
@@ -47,24 +47,14 @@ public class EmisBaseController extends BaseController
      */
     public void setPrivParams(BaseEntity entity){
 
-        if(!(getLoginUser().getUser().isTopSite())){
             try {
-                entity.getParams().put("isPrivQuery", "T");
                 entity.getParams().put("privSiteCode", getLoginUser().getUser().getOwnerSiteCode());
                 entity.getParams().put("privEmpCode", getLoginUser().getUser().getEmpCode());
                 entity.getParams().put("privEmpName", getLoginUser().getUser().getEmpName());
-
-                String info=JSON.toJSONString(entity.getParams());
-                System.out.println(info);
-                log.info(info);
-
             }catch (Exception ex){
                 ex.printStackTrace();
-
             }
-        }else{
-            entity.getParams().put("isPrivQuery", "F");
-        }
+
 
     }
 
diff --git a/emis-biz/src/main/resources/mapper/EmisTmsScanRecordMapper.xml b/emis-biz/src/main/resources/mapper/EmisTmsScanRecordMapper.xml
index 1d0457958..3b7f57dda 100644
--- a/emis-biz/src/main/resources/mapper/EmisTmsScanRecordMapper.xml
+++ b/emis-biz/src/main/resources/mapper/EmisTmsScanRecordMapper.xml
@@ -156,14 +156,6 @@
     </select>
 
 
-<!--    <if test="params.isPrivQuery != null and params.isPrivQuery ='T'">-->
-<!--        and (-->
-<!--        create_site=#{params.privSiteCode}-->
-<!--        )-->
-<!--    </if>-->
-
-
-
 
     <!-- 获取订单最后一条扫描记录 -->
     <select id="selectLastRecordByBillCode" parameterType="string" resultMap="EmisTmsScanRecordResult">
@@ -261,30 +253,25 @@
                 and sign_date <![CDATA[ <= ]]>  #{params.endSignDate}
             </if>
 
-<!--            <if test="params.isUploadPic != null and params.isUploadPic = 1 ">-->
-<!--                and pic_url is not null-->
-<!--            </if>-->
+            <if test="params.isUploadPic != null and params.isUploadPic == '1' ">
+                and pic_url is not null
+            </if>
 
-<!--            <if test="params.isUploadPic != null and params.isUploadPic = 0">-->
-<!--                and pic_url is null-->
-<!--            </if>-->
+            <if test="params.isUploadPic != null and params.isUploadPic == '0' ">
+                and pic_url is null
+            </if>
 
 
-            <if test="params.isPrivQuery != null and params.isPrivQuery ='T'">
+            <if test="params.isPrivQuery != null and params.isPrivQuery == 'T'">
                 and (
-                    1=1
-                    <if test="params.privSiteCode != null">
-                        AND scan_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
-                        )
-                    </if>
-
-
+                    scan_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
+                    )
                 )
             </if>
 
diff --git a/emis-biz/src/main/resources/mapper/EmisWaybillMapper.xml b/emis-biz/src/main/resources/mapper/EmisWaybillMapper.xml
index 405e3cd32..3b5169fb6 100644
--- a/emis-biz/src/main/resources/mapper/EmisWaybillMapper.xml
+++ b/emis-biz/src/main/resources/mapper/EmisWaybillMapper.xml
@@ -471,9 +471,17 @@
             </if>
 
 
-            <if test="params.isPrivQuery != null and params.isPrivQuery ='T'">
+            <if test="params.privSiteCode != null">
                 and (
-                    create_site=#{params.privSiteCode}
+                    send_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 salesmen=#{params.privEmpCode}
                     or payee=#{params.privEmpName}
                 )