ruoyi-admin/src/main/java/com/ruoyi/web/controller/device/TsbDeviceController.java

@@ -8,6 +8,7 @@ import com.ruoyi.common.enums.BusinessType;
 import com.ruoyi.common.utils.StringUtils;
 import com.ruoyi.common.utils.poi.ExcelUtil;
 import com.ruoyi.device.domain.entity.TsbDevice;
+import com.ruoyi.device.domain.model.TsbUserDeviceBind;
 import com.ruoyi.device.service.ITsbDeviceService;
 import com.ruoyi.device.service.ITsbUserDeviceService;
 import jakarta.servlet.http.HttpServletResponse;
@@ -166,7 +167,7 @@ public class TsbDeviceController extends BaseController
     @GetMapping("/unbindUsers")
     public AjaxResult unbindUsers()
     {
-        return success(tsbUserDeviceService.selectUnbindUsers());
+        return success(tsbUserDeviceService.selectUnbindUsers(new TsbUserDeviceBind()));
     }
 
     /**

ruoyi-admin/src/main/resources/application.yml

@@ -7,7 +7,7 @@ ruoyi:
   # 版权年份
   copyrightYear: 2026
   # 文件路径 示例（ Windows配置D:/ruoyi/uploadPath，Linux配置 /home/ruoyi/uploadPath）
-  profile: D:/ruoyi/uploadPath
+  profile: /home/web_app/tsb/uploadPath
   # 获取ip地址开关
   addressEnabled: false
   # 验证码类型 math 数字计算 char 字符验证
@@ -16,7 +16,7 @@ ruoyi:
 # 开发环境配置
 server:
   # 服务器的HTTP端口，默认为8080
-  port: 8080
+  port: 8061
   servlet:
     # 应用的访问路径
     context-path: /
@@ -67,7 +67,7 @@ spring:
   devtools:
     restart:
       # 热部署开关
-      enabled: true
+      enabled: false
   data:
     # redis 配置
     redis:

ruoyi-device/src/main/java/com/ruoyi/device/domain/entity/TsbUserDevice.java

@@ -1,10 +1,10 @@
 package com.ruoyi.device.domain.entity;
 
 import com.fasterxml.jackson.annotation.JsonFormat;
+import com.ruoyi.common.core.domain.BaseEntity;
 import org.apache.commons.lang3.builder.ToStringBuilder;
 import org.apache.commons.lang3.builder.ToStringStyle;
 
-import java.io.Serializable;
 import java.util.Date;
 
 /**
@@ -12,7 +12,7 @@ import java.util.Date;
  *
  * @author lwm
  */
-public class TsbUserDevice implements Serializable
+public class TsbUserDevice extends BaseEntity
 {
     private static final long serialVersionUID = 1L;
 

ruoyi-device/src/main/java/com/ruoyi/device/mapper/TsbUserDeviceMapper.java

@@ -41,10 +41,11 @@ public interface TsbUserDeviceMapper
 
     /**
      * 未绑定任何调试宝设备的用户列表（用于下拉）
+     * 当前用户的可选择用户 再 去掉已经绑定的用户
      *
      * @return 用户列表
      */
-    List<SysUser> selectUnbindUsers();
+    List<SysUser> selectUnbindUsers(TsbUserDevice bind);
 
     /**
      * 通过用户id 查询设备绑定关系

ruoyi-device/src/main/java/com/ruoyi/device/service/ITsbUserDeviceService.java

@@ -1,6 +1,7 @@
 package com.ruoyi.device.service;
 
 import com.ruoyi.common.core.domain.entity.SysUser;
+import com.ruoyi.device.domain.entity.TsbUserDevice;
 import com.ruoyi.device.domain.model.TsbUserDeviceBind;
 
 import java.util.List;
@@ -31,10 +32,11 @@ public interface ITsbUserDeviceService
 
     /**
      * 未绑定任何调试宝设备的用户列表（用于下拉）
+     * 当前用户的可选择用户 再 去掉已经绑定的用户
      *
      * @return 用户列表
      */
-    public List<SysUser> selectUnbindUsers();
+    public List<SysUser> selectUnbindUsers(TsbUserDevice bind);
 
     /**
      * 用户与设备绑定（一人一机、一机一人等规则在实现内校验）

ruoyi-device/src/main/java/com/ruoyi/device/service/impl/TsbDeviceServiceImpl.java

@@ -42,6 +42,7 @@ public class TsbDeviceServiceImpl implements ITsbDeviceService
      * @return 设备数据集合信息
      */
     @Override
+    @DataScope(deptAlias = "d")
     public List<TsbDevice> selectTsbDeviceList(TsbDevice tsbDevice)
     {
         return tsbDeviceMapper.selectTsbDeviceList(tsbDevice);

ruoyi-device/src/main/java/com/ruoyi/device/service/impl/TsbUserDeviceServiceImpl.java

@@ -1,5 +1,6 @@
 package com.ruoyi.device.service.impl;
 
+import com.ruoyi.common.annotation.DataScope;
 import com.ruoyi.common.core.domain.entity.SysUser;
 import com.ruoyi.common.enums.UserStatus;
 import com.ruoyi.common.exception.ServiceException;
@@ -70,13 +71,15 @@ public class TsbUserDeviceServiceImpl implements ITsbUserDeviceService
 
     /**
      * 未绑定任何调试宝设备的用户列表（用于下拉）
+     * 当前用户的可选择用户 再 去掉已经绑定的用户
      *
      * @return 用户列表
      */
     @Override
-    public List<SysUser> selectUnbindUsers()
+    @DataScope(deptAlias = "d")
+    public List<SysUser> selectUnbindUsers(TsbUserDevice bind)
     {
-        return tsbUserDeviceMapper.selectUnbindUsers();
+        return tsbUserDeviceMapper.selectUnbindUsers(bind);
     }
 
     /**

ruoyi-device/src/main/resources/mapper/device/TsbDeviceMapper.xml

@@ -101,6 +101,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="params.endProduceDate != null and params.endProduceDate != ''">
                 AND date_format(d.device_produce_date,'%Y%m%d') &lt;= date_format(#{params.endProduceDate},'%Y%m%d')
             </if>
+            <!-- 数据范围过滤 -->
+            ${params.dataScope}
         </where>
         order by d.device_id desc
     </select>

ruoyi-device/src/main/resources/mapper/device/TsbUserDeviceMapper.xml

@@ -77,13 +77,16 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         order by bud.user_id desc limit 1
     </select>
 
-    <select id="selectUnbindUsers" resultType="SysUser">
+    <select id="selectUnbindUsers" parameterType="TsbUserDevice" resultType="SysUser">
         select u.user_id   as userId,
                u.user_name as userName,
                u.nick_name as nickName
         from sys_user u
+                 left join sys_dept d on u.dept_id = d.dept_id
         where u.del_flag = '0'
           and u.status = '0'
+            <!-- 数据范围过滤 -->
+            ${params.dataScope}
           and not exists (select 1 from tsb_user_device bud where bud.user_id = u.user_id)
         order by u.user_id
     </select>

ruoyi-ui/vue.config.js

@@ -9,7 +9,7 @@ const CompressionPlugin = require('compression-webpack-plugin')
 
 const name = process.env.VUE_APP_TITLE || '若依管理系统' // 网页标题
 
-const baseUrl = 'http://localhost:8080' // 后端接口
+const baseUrl = 'http://localhost:8061' // 后端接口
 
 const port = process.env.port || process.env.npm_config_port || 80 // 端口