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 find() { - List organizations = service.findByUserId(String.valueOf(StpUtil.getLoginId()),String.valueOf(SaHolder.getStorage().get("adcd"))); + public ResultJson find(HttpServletRequest request) { + List 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') )