|
|
@@ -1525,17 +1525,42 @@
|
|
|
a.clue_process clueProcess,a.clue_time clueTime
|
|
|
from `user` a left join organization_identity b on a.id =b.uid
|
|
|
left join admin c on a.aid=c.id
|
|
|
- where a.clue_status =1 and a.clue_process in (0,2)
|
|
|
- <if test="aid !=null">
|
|
|
- and a.aid= #{aid}
|
|
|
- </if>
|
|
|
+ where a.clue_status =1
|
|
|
+ <include refid="selectUserClueListSql"/>
|
|
|
<if test="page_sql !=null">
|
|
|
${page_sql}
|
|
|
</if>
|
|
|
</select>
|
|
|
+ <sql id="selectUserClueListSql">
|
|
|
+ <if test="shiroType==1">
|
|
|
+ <if test="aid !=null">
|
|
|
+ and a.clue_aid= #{aid}
|
|
|
+ </if>
|
|
|
+ </if>
|
|
|
+ <if test="shiroType==2">
|
|
|
+ <if test="aid !=null">
|
|
|
+ and a.aid= #{aid}
|
|
|
+ </if>
|
|
|
+ </if>
|
|
|
+ <if test="clueProcess !=null">
|
|
|
+ and a.clue_process= #{clueProcess}
|
|
|
+ </if>
|
|
|
+ <if test="startTime !=null and endTime != null">
|
|
|
+ and a.clue_time between #{startTime} and #{endTime}
|
|
|
+ </if>
|
|
|
+ </sql>
|
|
|
<select id="selectUserClueCount" resultType="java.lang.Integer">
|
|
|
select count(*) from `user` a
|
|
|
- where clue_status =1 and clue_process in (0,2)
|
|
|
+ where clue_status =1
|
|
|
+ <if test="aid !=null">
|
|
|
+ and a.aid= #{aid}
|
|
|
+ </if>
|
|
|
+ <if test="clueProcess !=null">
|
|
|
+ and a.clue_process= #{clueProcess}
|
|
|
+ </if>
|
|
|
+ <if test="startTime !=null and endTime != null">
|
|
|
+ and a.clue_time between #{startTime} and #{endTime}
|
|
|
+ </if>
|
|
|
</select>
|
|
|
</mapper>
|
|
|
|