|
@ -138,6 +138,7 @@ |
|
|
DEL_FLAG = 0 |
|
|
DEL_FLAG = 0 |
|
|
AND banner_flag = '0' |
|
|
AND banner_flag = '0' |
|
|
AND pid = 0 |
|
|
AND pid = 0 |
|
|
|
|
|
and module_type='1' |
|
|
ORDER BY |
|
|
ORDER BY |
|
|
sort, |
|
|
sort, |
|
|
create_date DESC |
|
|
create_date DESC |
|
@ -154,11 +155,13 @@ |
|
|
FROM |
|
|
FROM |
|
|
epdc_notice en |
|
|
epdc_notice en |
|
|
RIGHT JOIN epdc_notice_department nd ON en.ID = nd.NOTICE_ID |
|
|
RIGHT JOIN epdc_notice_department nd ON en.ID = nd.NOTICE_ID |
|
|
|
|
|
inner join epdc_module_type mt on mt.id=en.TYPE_ID |
|
|
WHERE |
|
|
WHERE |
|
|
nd.DEPT_ID = #{deptId} |
|
|
nd.DEPT_ID = #{deptId} |
|
|
AND en.DEL_FLAG = '0' |
|
|
AND en.DEL_FLAG = '0' |
|
|
AND en.NOTICE_RELEASE_STATE = '1' |
|
|
AND en.NOTICE_RELEASE_STATE = '1' |
|
|
AND en.NOTICE_UP_DOWN_STATE = '1' |
|
|
AND en.NOTICE_UP_DOWN_STATE = '1' |
|
|
|
|
|
and mt.module_type='1' |
|
|
<if test="typeId != null and typeId !=''"> |
|
|
<if test="typeId != null and typeId !=''"> |
|
|
AND FIND_IN_SET(#{typeId},ALL_TYPE_ID) |
|
|
AND FIND_IN_SET(#{typeId},ALL_TYPE_ID) |
|
|
</if> |
|
|
</if> |
|
|