|
|
@@ -1769,9 +1769,9 @@
|
|
|
</select>
|
|
|
<select id="findMainProductsList" resultType="com.goafanti.customer.bo.OutUserMianProducts">
|
|
|
select oi.id ,u.id uid, u.nickname userName, oi.business_scope businessScope,
|
|
|
- um.update_name updateName,um.update_aid updateAid,
|
|
|
+ um.update_name updateName,um.update_aid updateAid,u.share_type shareType,
|
|
|
<if test="shiroType ==2">
|
|
|
- a.name adminName,d.name depName,u.share_type shareType,dg.name province,
|
|
|
+ a.name adminName,d.name depName,dg.name province,
|
|
|
</if>
|
|
|
date_format(u.transfer_time ,'%Y-%m-%d %H:%i:%s')transferTimes,
|
|
|
date_format(um.date_update_time,'%Y-%m-%d %H:%i:%s')dateUpdateTimes
|
|
|
@@ -1786,7 +1786,7 @@
|
|
|
left join admin a on u.aid=a.id left join department d on a.department_id =d.id
|
|
|
left join district_glossory dg on oi.location_province =dg.id
|
|
|
</if>
|
|
|
- where u.share_type in (0, 2, 3) and u.source in(1,2,3)
|
|
|
+ where u.`type` =1 and u.status=0
|
|
|
<if test="shiroType==1">
|
|
|
and u.information_maintainer = #{aid}
|
|
|
</if>
|
|
|
@@ -1797,9 +1797,10 @@
|
|
|
<if test="depId !=null">
|
|
|
and d.id= #{depId}
|
|
|
</if>
|
|
|
- <if test="shareType !=null">
|
|
|
- and u.share_type = #{shareType}
|
|
|
- </if>
|
|
|
+
|
|
|
+ </if>
|
|
|
+ <if test="shareType !=null">
|
|
|
+ and u.share_type = #{shareType}
|
|
|
</if>
|
|
|
<if test="userName != null">
|
|
|
and u.nickname like concat('%',#{userName},'%')
|
|
|
@@ -1825,7 +1826,7 @@
|
|
|
<if test="shiroType==2">
|
|
|
left join admin a on u.aid=a.id left join department d on a.department_id =d.id
|
|
|
</if>
|
|
|
- where u.share_type in (0, 2, 3) and u.source in(1,2,3)
|
|
|
+ where u.`type` =1 and u.status=0
|
|
|
<if test="shiroType==1">
|
|
|
and u.information_maintainer = #{aid}
|
|
|
</if>
|
|
|
@@ -1836,9 +1837,10 @@
|
|
|
<if test="depId !=null">
|
|
|
and d.id= #{depId}
|
|
|
</if>
|
|
|
- <if test="shareType !=null">
|
|
|
- and u.share_type = #{shareType}
|
|
|
- </if>
|
|
|
+
|
|
|
+ </if>
|
|
|
+ <if test="shareType !=null">
|
|
|
+ and u.share_type = #{shareType}
|
|
|
</if>
|
|
|
<if test="userName != null">
|
|
|
and u.nickname like concat('%',#{userName},'%')
|