From 338b699d1492aad0f646cd4c4c5a6d0f7eee6760 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=9F=A9=E5=9B=BD=E4=B8=9C?= <mythxb@qq.com>
Date: Thu, 5 Jan 2023 14:24:17 +0800
Subject: [PATCH] =?UTF-8?q?=E9=9A=90=E6=82=A3=E5=88=97=E8=A1=A8=20?=
 =?UTF-8?q?=E5=92=8C=20=E5=90=AF=E5=8A=A8=E6=8A=A5=E9=94=99=E5=A4=84?=
 =?UTF-8?q?=E7=90=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/resources/mapper/check/BookEntCheckMapper.xml  | 6 +++---
 .../src/main/resources/mapper/check/BookEntHTMapper.xml     | 2 +-
 inventory-ent/src/main/resources/application.yml            | 2 +-
 .../com/rzyc/config/{PageAspect.java => PageGovAspect.java} | 2 +-
 utils/src/main/java/com/common/utils/jwt/JwtUtil.java       | 6 ++++++
 5 files changed, 12 insertions(+), 6 deletions(-)
 rename inventory-gov/src/main/java/com/rzyc/config/{PageAspect.java => PageGovAspect.java} (99%)

diff --git a/inventory-dao/src/main/resources/mapper/check/BookEntCheckMapper.xml b/inventory-dao/src/main/resources/mapper/check/BookEntCheckMapper.xml
index 54a9617..0b59d0a 100644
--- a/inventory-dao/src/main/resources/mapper/check/BookEntCheckMapper.xml
+++ b/inventory-dao/src/main/resources/mapper/check/BookEntCheckMapper.xml
@@ -681,8 +681,7 @@
     left join SysUnit su on bc.CheckUniy=su.SysUnitId
     left join SysEnterprise se on se.SysEnterpriseId=bc.BaseEntId
     And se.IsHide='否' and se.State = '启用'
-    where (se.OrgCode = #{areaCode} OR se.street_code = #{areaCode}
-    OR se.community_code = #{areaCode})
+    where FIND_IN_SET(#{areaCode},se.area_path)
     <if test="null != entName and '' != entName">
       and (se.EntName like concat('%',#{entName},'%') or bc.ZhiFaRen like concat('%',#{entName},'%') )
     </if>
@@ -762,7 +761,8 @@
 
 
   <select id="countBySuperiorUnitId" resultType="java.lang.Integer">
-    select count(*) as DepartmentCheckTotal from BookEntCheck where CheckUniy in(select SysUnitId from SysUnit where SuperiorUnitId=#{superiorUnitId})
+    select count(*) as DepartmentCheckTotal from BookEntCheck
+    where CheckUniy in(select SysUnitId from SysUnit where SuperiorUnitId=#{superiorUnitId})
   </select>
 
 
diff --git a/inventory-dao/src/main/resources/mapper/check/BookEntHTMapper.xml b/inventory-dao/src/main/resources/mapper/check/BookEntHTMapper.xml
index 3fdabe3..79e645f 100644
--- a/inventory-dao/src/main/resources/mapper/check/BookEntHTMapper.xml
+++ b/inventory-dao/src/main/resources/mapper/check/BookEntHTMapper.xml
@@ -1310,7 +1310,7 @@
    select sys.EntName,bt.* from  BookEntHT  bt
    inner join  SysEnterprise sys  on  bt.SysEnterpriseId = sys.SysEnterpriseId
    where sys.State = '启用'
-     and (sys.OrgCode = #{areaCode} or sys.street_code = #{areaCode} or sys.community_code = #{areaCode})
+     and FIND_IN_SET(#{areaCode},sys.area_path)
     <if test="null != title and '' != title">
       and bt.HiddenArea like concat('%',#{title},'%')
     </if>
diff --git a/inventory-ent/src/main/resources/application.yml b/inventory-ent/src/main/resources/application.yml
index a6560f0..a703748 100644
--- a/inventory-ent/src/main/resources/application.yml
+++ b/inventory-ent/src/main/resources/application.yml
@@ -1,6 +1,6 @@
 spring:
   profiles:
-    active: dev #设定打包配置文件
+    active: prod #设定打包配置文件
 
 
 
diff --git a/inventory-gov/src/main/java/com/rzyc/config/PageAspect.java b/inventory-gov/src/main/java/com/rzyc/config/PageGovAspect.java
similarity index 99%
rename from inventory-gov/src/main/java/com/rzyc/config/PageAspect.java
rename to inventory-gov/src/main/java/com/rzyc/config/PageGovAspect.java
index f4c7b84..35ee535 100644
--- a/inventory-gov/src/main/java/com/rzyc/config/PageAspect.java
+++ b/inventory-gov/src/main/java/com/rzyc/config/PageGovAspect.java
@@ -20,7 +20,7 @@ import java.util.List;
  **/
 @Aspect
 @Component
-public class PageAspect {
+public class PageGovAspect {
     @Pointcut("@annotation(com.common.utils.pager.PageOperation)execution(* com.rzyc..*.*(..))")
     public void page() {}
 
diff --git a/utils/src/main/java/com/common/utils/jwt/JwtUtil.java b/utils/src/main/java/com/common/utils/jwt/JwtUtil.java
index 57a074c..32702a3 100644
--- a/utils/src/main/java/com/common/utils/jwt/JwtUtil.java
+++ b/utils/src/main/java/com/common/utils/jwt/JwtUtil.java
@@ -71,4 +71,10 @@ public class JwtUtil {
             return "";
         }
     }
+
+    public static void main(String[] args) {
+
+        System.out.println(checkToken("eyJ0eXAiOiJKV1QiLCJhbGciOiJIUzI1NiJ9.eyJleHAiOjE2NzI0NTQwNzAsInVzZXJJZCI6Ijg3OWE4MWIzLTIzNzktNGFkNy1iYWI4LTBlYTUxZGNlY2Y5ZSJ9.nd56xaEuyANKG-nAaDlPsYPcvQ44Oo7a0Cf4nUjN2KU"));
+
+    }
 }