From f90f96ef5e29cdb90bd2e71d668966d1bb052391 Mon Sep 17 00:00:00 2001
From: lijianlin <q614588746@163.com>
Date: Mon, 4 Aug 2025 15:32:04 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9D=83=E9=99=90=E5=9C=B0=E5=8C=BA=E4=BC=98?=
 =?UTF-8?q?=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/com/example/demo/serviceImpl/coin/PermissionServiceImpl.java | 4 ++++
 src/main/resources/mapper/PermissionMapper.xml                        | 2 +-
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/src/main/java/com/example/demo/serviceImpl/coin/PermissionServiceImpl.java b/src/main/java/com/example/demo/serviceImpl/coin/PermissionServiceImpl.java
index aaa66ec..193f3fc 100644
--- a/src/main/java/com/example/demo/serviceImpl/coin/PermissionServiceImpl.java
+++ b/src/main/java/com/example/demo/serviceImpl/coin/PermissionServiceImpl.java
@@ -8,6 +8,7 @@ import com.example.demo.domain.vo.coin.Password;
 import com.example.demo.domain.vo.coin.Permission;
 import com.example.demo.domain.vo.coin.Result;
 import com.example.demo.mapper.coin.AdminMapper;
+import com.example.demo.mapper.coin.MarketMapper;
 import com.example.demo.mapper.coin.PermissionMapper;
 import com.example.demo.service.coin.PermissionService;
 import com.github.pagehelper.PageHelper;
@@ -37,6 +38,8 @@ public class PermissionServiceImpl implements PermissionService {
     private PermissionMapper permissionMapper;
     @Autowired
     private AdminMapper adminMapper;
+    @Autowired
+    private MarketMapper marketMapper;
 
     @Override
     public List<String> getposition(String token) {
@@ -50,6 +53,7 @@ public class PermissionServiceImpl implements PermissionService {
 
     @Override
     public PageInfo<Permission> getpermission(Integer pageNum, Integer pageSize, Permission permission) {
+
         PageHelper.startPage(pageNum, pageSize);
         List<Permission> list = permissionMapper.getPermission(permission);
         for (Permission item : list) {
diff --git a/src/main/resources/mapper/PermissionMapper.xml b/src/main/resources/mapper/PermissionMapper.xml
index eded8b8..624e73e 100644
--- a/src/main/resources/mapper/PermissionMapper.xml
+++ b/src/main/resources/mapper/PermissionMapper.xml
@@ -84,7 +84,7 @@
             <if test="postiton!=null and postiton.length>0">
                 and admin.postiton=#{postiton}
             </if>
-            <if test="markets != null and markets.size() > 0 and '1' not in markets">
+            <if test="markets != null and markets.size() > 0 and '总部' not in markets and '研发部' not in markets">
                 AND (
                 <foreach collection="markets" item="market" open="" close="" separator=" OR ">
                     admin.market LIKE CONCAT('%', #{market}, '%')