root
/
agri
2
0
Fork 0
Code Issues Pull Requests Packages Projects 1 Releases Wiki Activity

暂时提交

master
lld 2026-04-05 16:33:21 +08:00
parent 7b520eb8be
commit da808bb692
2 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
agri-system/src/main/resources/mapper/system/SysAgriInfoMapper.xml
View File

@ -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>

5
agri-system/src/main/resources/mapper/system/SysUserAgriMapper.xml
View File

@ -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>