|
@@ -56,7 +56,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
|
|
|
<include refid="selectAlertConfigurationVo"/>
|
|
|
WHERE alert_status = 1
|
|
|
<if test="userType !=null and userType !='' ">
|
|
|
- and user_type = #{userType}
|
|
|
+ and user_type like concat('%', #{userType}, '%')
|
|
|
</if>
|
|
|
</select>
|
|
|
|
|
@@ -175,8 +175,17 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
|
|
|
BUSINESS_UNIT = '零售'
|
|
|
<include refid="orgListWhere"/>
|
|
|
GROUP BY
|
|
|
- suboffice_code
|
|
|
+ suboffice_code UNION
|
|
|
</if>
|
|
|
+ SELECT
|
|
|
+ customer_id AS orgCode
|
|
|
+ FROM
|
|
|
+ order_sales_sum_tuc_customer
|
|
|
+ WHERE
|
|
|
+ BUSINESS_UNIT = '零售'
|
|
|
+ <include refid="orgListWhere"/>
|
|
|
+ GROUP BY
|
|
|
+ customer_id
|
|
|
</select>
|
|
|
<select id="selectOrgCode" resultType="java.lang.String">
|
|
|
|