From e0cdd77f195a89acbfaf9c0fcf50238a80d53818 Mon Sep 17 00:00:00 2001
From: xjm <xjm@cloudowr.com>
Date: Thu, 23 May 2024 16:41:42 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BB=A3=E7=A0=81=E6=8F=90=E4=BA=A4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/whdc/controller/OrganizationController.java    |  6 +++---
 src/main/resources/mapper/AdinfoMapper.xml             | 10 +++++-----
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/src/main/java/com/whdc/controller/OrganizationController.java b/src/main/java/com/whdc/controller/OrganizationController.java
index b3ee078..fd325f3 100644
--- a/src/main/java/com/whdc/controller/OrganizationController.java
+++ b/src/main/java/com/whdc/controller/OrganizationController.java
@@ -1,7 +1,6 @@
 package com.whdc.controller;
 
 
-import cn.dev33.satoken.context.SaHolder;
 import cn.dev33.satoken.stp.StpUtil;
 import com.whdc.model.entity.Organization;
 import com.whdc.model.entity.UnitDict;
@@ -19,6 +18,7 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
 
+import javax.servlet.http.HttpServletRequest;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Objects;
@@ -40,8 +40,8 @@ public class OrganizationController {
 
     @ApiOperation(value = "查询所有")
     @PostMapping(value = "find")
-    public ResultJson<FcCommVo> find() {
-        List<Organization> organizations = service.findByUserId(String.valueOf(StpUtil.getLoginId()),String.valueOf(SaHolder.getStorage().get("adcd")));
+    public ResultJson<FcCommVo> find(HttpServletRequest request) {
+        List<Organization> organizations = service.findByUserId(String.valueOf(StpUtil.getLoginId()),request.getHeader("adcd"));
         return ResultJson.ok(findFcCommVo(organizations));
 
     }
diff --git a/src/main/resources/mapper/AdinfoMapper.xml b/src/main/resources/mapper/AdinfoMapper.xml
index 5630455..3175b71 100644
--- a/src/main/resources/mapper/AdinfoMapper.xml
+++ b/src/main/resources/mapper/AdinfoMapper.xml
@@ -18,31 +18,31 @@
            or exists(
             select 1
             from FXKH_TXL.ADINFO a
-            whereand (a.adnm like CONCAT('%', #{adnm}, '%') or a.adcd like CONCAT('%', #{adcd}, '%'))
+            where (a.adnm like CONCAT('%', #{adnm}, '%') or a.adcd like CONCAT('%', #{adcd}, '%'))
               and t.adcd =  concat(left(a.adcd, 12), '000')
         )
            or exists(
             select 1
             from FXKH_TXL.ADINFO a
-            whereand (a.adnm like CONCAT('%', #{adnm}, '%') or a.adcd like CONCAT('%', #{adcd}, '%'))
+            where (a.adnm like CONCAT('%', #{adnm}, '%') or a.adcd like CONCAT('%', #{adcd}, '%'))
               and t.adcd =  concat(left(a.adcd, 9), '000000')
         )
            or exists(
             select 1
             from FXKH_TXL.ADINFO a
-            whereand (a.adnm like CONCAT('%', #{adnm}, '%') or a.adcd like CONCAT('%', #{adcd}, '%'))
+            where (a.adnm like CONCAT('%', #{adnm}, '%') or a.adcd like CONCAT('%', #{adcd}, '%'))
               and t.adcd =  concat(left(a.adcd, 6), '000000000')
         )
            or exists(
             select 1
             from FXKH_TXL.ADINFO a
-            whereand (a.adnm like CONCAT('%', #{adnm}, '%') or a.adcd like CONCAT('%', #{adcd}, '%'))
+            where (a.adnm like CONCAT('%', #{adnm}, '%') or a.adcd like CONCAT('%', #{adcd}, '%'))
               and t.adcd =  concat(left(a.adcd, 4), '00000000000')
         )
            or exists(
             select 1
             from FXKH_TXL.ADINFO a
-            whereand (a.adnm like CONCAT('%', #{adnm}, '%') or a.adcd like CONCAT('%', #{adcd}, '%'))
+            where (a.adnm like CONCAT('%', #{adnm}, '%') or a.adcd like CONCAT('%', #{adcd}, '%'))
               and t.adcd =  concat(left(a.adcd, 2), '0000000000000')
         )