From da808bb6924ac2784b1620b8ce90d69f7c1169ed Mon Sep 17 00:00:00 2001
From: lld <15027638633@163.com>
Date: Sun, 5 Apr 2026 16:33:21 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9A=82=E6=97=B6=E6=8F=90=E4=BA=A4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/resources/mapper/system/SysAgriInfoMapper.xml   | 4 ++--
 .../src/main/resources/mapper/system/SysUserAgriMapper.xml   | 5 +++--
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/agri-system/src/main/resources/mapper/system/SysAgriInfoMapper.xml b/agri-system/src/main/resources/mapper/system/SysAgriInfoMapper.xml
index 13f06de..700e6fb 100644
--- a/agri-system/src/main/resources/mapper/system/SysAgriInfoMapper.xml
+++ b/agri-system/src/main/resources/mapper/system/SysAgriInfoMapper.xml
@@ -179,7 +179,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <include refid="agriUserVo"/>
         <if test="userId == null"> and user_agri.user_id is null </if>
         <where>
-            is_deleted = 0
+            is_deleted = 0 and user_agri.status=1
             <if test="userId != null"> and user_agri.user_id = #{userId}</if>
             <if test="imei != null  and imei != ''"> and agri.imei = #{imei}</if>
             <if test="workMode != null  and workMode != ''"> and agri.work_mode = #{workMode}</if>
@@ -194,7 +194,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     <select id="findAgriInfoByUser" parameterType="SysAgriInfo" resultType="com.agri.system.domain.vo.AgriInfoView">
         <include refid="agriInfoVo"/>
         <where>
-            is_deleted = 0
+            is_deleted = 0 and `user_agri`.status=1
             <if test="userId != null"> and user_agri.user_id = #{userId}</if>
             <if test="imei != null  and imei != ''"> and agri.imei = #{imei}</if>
             <if test="workMode != null  and workMode != ''"> and agri.work_mode = #{workMode}</if>
diff --git a/agri-system/src/main/resources/mapper/system/SysUserAgriMapper.xml b/agri-system/src/main/resources/mapper/system/SysUserAgriMapper.xml
index b5c3e08..4966e02 100644
--- a/agri-system/src/main/resources/mapper/system/SysUserAgriMapper.xml
+++ b/agri-system/src/main/resources/mapper/system/SysUserAgriMapper.xml
@@ -180,8 +180,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             sys_user_agri user_agri
         LEFT JOIN sys_user `u` ON user_agri.user_id = `u`.user_id and `u`.del_flag=0
         <where>
+            `user_agri`.status=1
             <if test="imeiList != null and imeiList.size() > 0">
-                user_agri.agri_id IN
+               and user_agri.agri_id IN
                 <foreach collection="imeiList" item="imei" open="(" separator="," close=")">
                     #{imei}
                 </foreach>
@@ -221,7 +222,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <if test="agriId != null "> and user_agri.agri_id = #{agriId}</if>
         <if test="agriId == null "> and user_agri.agri_id is NULL</if>
         <where>
-            and `u`.del_flag=0 and `u`.status = 0
+            and `u`.del_flag=0 and `u`.status = 0 and `user_agri`.status=1
             <if test="role != null "> and user_agri.role = #{role}</if>
             <if test="permMask != null "> and user_agri.perm_mask = #{permMask}</if>
             <if test="status != null "> and user_agri.status = #{status}</if>