|
|
@@ -1391,7 +1391,7 @@
|
|
|
</if>
|
|
|
</select>
|
|
|
<select id="findMainProductsList" resultType="com.goafanti.customer.bo.OutUserMianProducts">
|
|
|
- select oi.id ,u.id uid, u.nickname userName, oi.business_scope businessScope,
|
|
|
+ select oi.id ,u.id uid, u.nickname userName, oi.business_scope businessScope,u.nature,u.nature_other natureOther,
|
|
|
um.update_name updateName,um.update_aid updateAid,u.share_type shareType,
|
|
|
<if test="shiroType ==2">
|
|
|
a.name adminName,d.name depName,dg.name province,
|
|
|
@@ -1428,6 +1428,9 @@
|
|
|
<if test="userName != null">
|
|
|
and u.nickname like concat('%',#{userName},'%')
|
|
|
</if>
|
|
|
+ <if test="nature !=null">
|
|
|
+ and u.nature = #{nature}
|
|
|
+ </if>
|
|
|
<if test="key !=null">
|
|
|
and oi.business_scope like concat('%',#{key},'%')
|
|
|
</if>
|
|
|
@@ -1470,6 +1473,9 @@
|
|
|
<if test="userName != null">
|
|
|
and u.nickname like concat('%',#{userName},'%')
|
|
|
</if>
|
|
|
+ <if test="nature !=null">
|
|
|
+ and u.nature = #{nature}
|
|
|
+ </if>
|
|
|
<if test="key !=null">
|
|
|
and oi.business_scope like concat('%',#{key},'%')
|
|
|
</if>
|