|
|
@@ -35,7 +35,7 @@ public class AppNoticeDaoImpl extends GenericDaoHibernate<AppNoticeModel, Intege
|
|
|
StringBuffer sbf = new StringBuffer();
|
|
|
sbf.append(" select '' roleId,0 isApproval,0 isPublish,'' roleName,apn.approval_type approvalType,apn.orgId, apn.content_type,apn.orgIds,apn.id,apn.title,apn.content,apn.content_txt,apn.url_address,apn.state,apn.approval_user,apn.summary_info,apn.cover_url,apn.notice_type,(if(IFNULL(apn.order_num,0) >0,1,0)) orderNum");
|
|
|
sbf.append(" ,DATE_FORMAT(approval_time,'%Y/%m/%d %T') approval_time,DATE_FORMAT( apn.createTime, '%Y/%m/%d %T') createTime ,(if(IFNULL(apn.order_num,0) >0,apn.order_num,0)) orderNo ");
|
|
|
- sbf.append(" ,apn.creator,apn.modifier,DATE_FORMAT( apn.modifyTime,'%Y/%m/%d %T') modifyTime,apn.isEnabled,aus.FULL_NAME fullName,aus.USERNAME ");
|
|
|
+ sbf.append(" ,apn.creator,apn.modifier,DATE_FORMAT( apn.modifyTime,'%Y/%m/%d %T') modifyTime,apn.isEnabled,aus.FULL_NAME fullName,aus.FULL_NAME USERNAME ");
|
|
|
sbf.append(" from tb_app_notice apn ");
|
|
|
sbf.append(" left join tb_app_user aus on apn.creator=aus.id ");
|
|
|
sbf.append(" where 1=1 and apn.isEnabled <> 0");
|
|
|
@@ -111,7 +111,7 @@ public class AppNoticeDaoImpl extends GenericDaoHibernate<AppNoticeModel, Intege
|
|
|
sbf.append(" SELECT apn.content_type, apn.orgIds, apn.id noticeId,(case when apnd.id is null then 1 else 2 end) sourceType, ifnull(apnd.id,apn.id) id, ifnull(apnd.title,apn.title) title, ifnull(apnd.content,apn.content) content,(if(IFNULL(apn.order_num,0) >0,1,0)) orderNum, ");
|
|
|
sbf.append(" ifnull(apnd.contentTxt,apn.content_txt) content_txt, ifnull(apnd.url_address,apn.url_address) url_address, apn.state, apn.approval_user, ifnull(apnd.summaryInfo,apn.summary_info) summary_info,(if(IFNULL(apn.order_num,0) >0,apn.order_num,0)) orderNo, ");
|
|
|
sbf.append(" ifnull(apnd.coverUrl,apn.cover_url) cover_url, apn.notice_type, DATE_FORMAT( approval_time, '%Y/%m/%d %T' ) approval_time, ifnull(DATE_FORMAT( apnd.createTime, '%Y/%m/%d %T' ),DATE_FORMAT( apn.createTime, '%Y/%m/%d %T' )) createTime, ");
|
|
|
- sbf.append(" ifnull(apnd.creator,apn.creator) creator, apn.modifier, DATE_FORMAT( apn.modifyTime, '%Y/%m/%d %T' ) modifyTime, apn.isEnabled, aus.FULL_NAME fullName,aus.USERNAME ");
|
|
|
+ sbf.append(" ifnull(apnd.creator,apn.creator) creator, apn.modifier, DATE_FORMAT( apn.modifyTime, '%Y/%m/%d %T' ) modifyTime, apn.isEnabled, aus.FULL_NAME fullName,aus.FULL_NAME USERNAME ");
|
|
|
sbf.append(" from tb_app_notice apn ");
|
|
|
sbf.append(" LEFT JOIN tb_app_notice_detail apnd ON apnd.sourceId = apn.id AND apnd.isEnabled <> 0 ");
|
|
|
sbf.append(" left join tb_app_user aus on apn.creator=aus.id ");
|
