|
|
@@ -55,7 +55,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
|
|
|
<select id="selectAlertConfigurationByAlertStatus" parameterType="Long" resultMap="AlertConfigurationResult">
|
|
|
<include refid="selectAlertConfigurationVo"/>
|
|
|
WHERE alert_status = 1
|
|
|
- <if test="userType !=null and userType !=''">
|
|
|
+ <if test="userType !=null and userType !='' and orgCode !='null' ">
|
|
|
and user_type = #{userType}
|
|
|
</if>
|
|
|
</select>
|
|
|
@@ -155,7 +155,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
|
|
|
GROUP BY
|
|
|
company_code UNION
|
|
|
</if>
|
|
|
- <if test="parType != null and parType == 'saledept_level' or parType == 'office_level' or parType == 'diy_level' ">
|
|
|
+ <if test="parType != null and parType == 'company_level' or parType == 'saledept_level' or parType == 'office_level' or parType == 'diy_level' ">
|
|
|
SELECT
|
|
|
saledept_code AS orgCode
|
|
|
FROM
|
|
|
@@ -166,7 +166,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
|
|
|
GROUP BY
|
|
|
saledept_code UNION
|
|
|
</if>
|
|
|
- <if test="parType != null and parType == 'suboffice_level' or parType == 'diy_level' ">
|
|
|
+ <if test="parType != null and parType == 'company_level' or parType == 'suboffice_level' or parType == 'saledept_level' or parType == 'office_level' or parType == 'diy_level' ">
|
|
|
SELECT
|
|
|
suboffice_code AS orgCode
|
|
|
FROM
|
