best_yunwei
/
ai_images
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix: 解决合并问题

This commit is contained in:
yys 2026-04-21 11:05:13 +08:00
parent e516105893
commit 20a063d6aa
1 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
web-api/ruoyi-system/src/main/resources/mapper/system/AiUserMapper.xml
View File

@ -87,17 +87,16 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
select count(1) from ai_user where del_flag = '0' and dept_id = #{deptId} select count(1) from ai_user where del_flag = '0' and dept_id = #{deptId}
</select> </select>
<<<<<<< HEAD
<select id="selectAiUserIdsByDeptId" resultType="java.lang.Long"> <select id="selectAiUserIdsByDeptId" resultType="java.lang.Long">
select id from ai_user where del_flag = '0' and dept_id = #{deptId} select id from ai_user where del_flag = '0' and dept_id = #{deptId}
======= </select>
<select id="countNormalAiUsersByDeptId" resultType="int"> <select id="countNormalAiUsersByDeptId" resultType="int">
select count(1) from ai_user select count(1) from ai_user
where del_flag = '0' and status = 0 and dept_id = #{deptId} where del_flag = '0' and status = 0 and dept_id = #{deptId}
<if test="excludeUserId != null"> <if test="excludeUserId != null">
and id != #{excludeUserId} and id != #{excludeUserId}
</if> </if>
>>>>>>> origin/seedance_balance
</select> </select>
<select id="selectPasswordById" resultType="java.lang.String"> <select id="selectPasswordById" resultType="java.lang.String">
select password from ai_user where id = #{id} select password from ai_user where id = #{id}