From 8b874833b74223a22e69c8d67722789891a4fa52 Mon Sep 17 00:00:00 2001
From: sh <sh@zkr.com>
Date: Thu, 30 Oct 2025 16:34:34 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E7=BB=99=E6=B5=AA=E6=BD=AE?=
 =?UTF-8?q?=E6=8F=90=E4=BE=9B=E7=9A=84=E4=BA=BA=E3=80=81=E5=B2=97=E3=80=81?=
 =?UTF-8?q?=E4=BC=81=E7=9A=84=E4=BF=A1=E6=81=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../ruoyi/cms/controller/cms/CmsAppUserController.java | 10 ++++++++++
 .../java/com/ruoyi/cms/service/IAppUserService.java    |  2 ++
 .../com/ruoyi/cms/service/impl/AppUserServiceImpl.java |  6 ++++++
 .../src/main/resources/mapper/app/AppUserMapper.xml    |  1 +
 .../src/main/resources/mapper/app/CompanyMapper.xml    |  1 +
 .../com/ruoyi/framework/config/SecurityConfig.java     |  2 +-
 6 files changed, 21 insertions(+), 1 deletion(-)

diff --git a/ruoyi-bussiness/src/main/java/com/ruoyi/cms/controller/cms/CmsAppUserController.java b/ruoyi-bussiness/src/main/java/com/ruoyi/cms/controller/cms/CmsAppUserController.java
index ee30da7..bfea227 100644
--- a/ruoyi-bussiness/src/main/java/com/ruoyi/cms/controller/cms/CmsAppUserController.java
+++ b/ruoyi-bussiness/src/main/java/com/ruoyi/cms/controller/cms/CmsAppUserController.java
@@ -144,4 +144,14 @@ public class CmsAppUserController extends BaseController
         }
         return AjaxResult.success(appUserService.editRegisterUser(registerBody));
     }
+
+    @ApiOperation("查询APP用户列表")
+//    @PreAuthorize("@ss.hasPermi('cms:appUser:list')")
+    @GetMapping("/noTmlist")
+    public TableDataInfo noTmlist(AppUser appUser)
+    {
+        startPage();
+        List<AppUser> list = appUserService.selectNoTmAppUserList(appUser);
+        return getDataTable(list);
+    }
 }
diff --git a/ruoyi-bussiness/src/main/java/com/ruoyi/cms/service/IAppUserService.java b/ruoyi-bussiness/src/main/java/com/ruoyi/cms/service/IAppUserService.java
index 66bd04b..bfb0d49 100644
--- a/ruoyi-bussiness/src/main/java/com/ruoyi/cms/service/IAppUserService.java
+++ b/ruoyi-bussiness/src/main/java/com/ruoyi/cms/service/IAppUserService.java
@@ -66,4 +66,6 @@ public interface IAppUserService
     public AppUser getUserInfo();
 
     public int editRegisterUser(RegisterBody registerBody);
+
+    public List<AppUser> selectNoTmAppUserList(AppUser appUser);
 }
diff --git a/ruoyi-bussiness/src/main/java/com/ruoyi/cms/service/impl/AppUserServiceImpl.java b/ruoyi-bussiness/src/main/java/com/ruoyi/cms/service/impl/AppUserServiceImpl.java
index 1e425a4..c179225 100644
--- a/ruoyi-bussiness/src/main/java/com/ruoyi/cms/service/impl/AppUserServiceImpl.java
+++ b/ruoyi-bussiness/src/main/java/com/ruoyi/cms/service/impl/AppUserServiceImpl.java
@@ -325,4 +325,10 @@ public class AppUserServiceImpl extends ServiceImpl<AppUserMapper,AppUser> imple
             }
         }
     }
+
+    @Override
+    public List<AppUser> selectNoTmAppUserList(AppUser appUser)
+    {
+        return appUserMapper.selectAppUserList(appUser);
+    }
 }
diff --git a/ruoyi-bussiness/src/main/resources/mapper/app/AppUserMapper.xml b/ruoyi-bussiness/src/main/resources/mapper/app/AppUserMapper.xml
index 3bc18fa..b0b39d4 100644
--- a/ruoyi-bussiness/src/main/resources/mapper/app/AppUserMapper.xml
+++ b/ruoyi-bussiness/src/main/resources/mapper/app/AppUserMapper.xml
@@ -56,6 +56,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="loginDate != null "> and login_date = #{loginDate}</if>
             <if test="experience != null "> and experience = #{experience}</if>
             <if test="idCard != null  and idCard != ''"> and id_card like concat('%', CAST(#{idCard} AS VARCHAR), '%')</if>
+            <if test="userId != null"> and user_id = #{userId}</if>
         </where>
     </select>
     <select id="selectByJobId" resultType="com.ruoyi.common.core.domain.entity.AppUser" parameterType="java.lang.Long">
diff --git a/ruoyi-bussiness/src/main/resources/mapper/app/CompanyMapper.xml b/ruoyi-bussiness/src/main/resources/mapper/app/CompanyMapper.xml
index d8b6e47..e1c3daf 100644
--- a/ruoyi-bussiness/src/main/resources/mapper/app/CompanyMapper.xml
+++ b/ruoyi-bussiness/src/main/resources/mapper/app/CompanyMapper.xml
@@ -75,6 +75,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="nature != null  and nature != ''"> and nature = #{nature}</if>
             <if test="code != null  and code != ''"> and code = #{code}</if>
             <if test="status != null  and status != ''"> and status = #{status}</if>
+            <if test="companyId != null  and companyId != ''"> and company_id = #{companyId}</if>
         </where>
     </select>
     <select id="label" resultMap="CompanyResult">
diff --git a/ruoyi-framework/src/main/java/com/ruoyi/framework/config/SecurityConfig.java b/ruoyi-framework/src/main/java/com/ruoyi/framework/config/SecurityConfig.java
index 6c5a0fd..e266007 100644
--- a/ruoyi-framework/src/main/java/com/ruoyi/framework/config/SecurityConfig.java
+++ b/ruoyi-framework/src/main/java/com/ruoyi/framework/config/SecurityConfig.java
@@ -111,7 +111,7 @@ public class SecurityConfig
             .authorizeHttpRequests((requests) -> {
                 permitAllUrl.getUrls().forEach(url -> requests.antMatchers(url).permitAll());
                 // 对于登录login 注册register 验证码captchaImage 允许匿名访问
-                requests.antMatchers("/login", "/register", "/captchaImage","/app/login","/websocket/**","/speech-recognition","/speech-synthesis","/cms/company/listPage","/cms/appUser/list").permitAll()
+                requests.antMatchers("/login", "/register", "/captchaImage","/app/login","/websocket/**","/speech-recognition","/speech-synthesis","/cms/company/listPage","/cms/appUser/noTmlist").permitAll()
                     // 静态资源，可匿名访问
                     .antMatchers(HttpMethod.GET, "/", "/*.html", "/**/*.html", "/**/*.css", "/**/*.js", "/profile/**").permitAll()
                     // 移动端公用查询，可匿名访问