Browse Source

业务提醒开发

anderx 6 years ago
parent
commit
96172b68c2

+ 1 - 1
src/main/java/com/goafanti/admin/service/impl/NoticeServiceImpl.java

@@ -41,7 +41,7 @@ public class NoticeServiceImpl extends BaseMybatisDao<NoticeMapper> implements N
 		Pagination<NoticeBo> notice = (Pagination<NoticeBo>) findPage("findUnreadNoticeListByPage", "findUnreadNoticeCount",
 				params, pageNo, pageSize);
 
-		if (!TokenManager.hasRole(AFTConstants.SUPERADMIN) && null != notice.getList() && notice.getList().size()>0) {
+		if (null != notice.getList() && notice.getList().size()>0) {
 			List<Notice> list = (List<Notice>) notice.getList();
 			List<String> dl = new ArrayList<String>();
 			for (Notice n : list) {

+ 1 - 1
src/main/java/com/goafanti/common/mapper/TOrderInvoiceMapper.xml

@@ -699,7 +699,7 @@
   
   <select id="salesmanOrderInvoiceList" resultType="com.goafanti.order.bo.TOrderInvoiceBo">
     select a.id ,a.order_no as orderNo,b.contract_no contractNo,a.amount,date_format(a.create_time,'%Y-%m-%d %H:%i:%S') as createTime,
-	a.reject_reason as  rejectReason,a.status from t_order_invoice a left join t_order_new b 
+	a.reject_reason as  rejectReason,a.status ,a.approval from t_order_invoice a left join t_order_new b 
 	on a.order_no=b.order_no where a.status !=4
 	<if test="orderNo !=null">
 	and a.order_no = #{orderNo,jdbcType=VARCHAR}