通告已读未读判断更新

src/custom/restcontroller/webmanage/saletool/notice/SQL/通告列表查询.sql

@@ -14,7 +14,7 @@ SELECT
     t1.status,
     t1.isontop,
     t1.readcount,
-		(CASE WHEN  (SELECT COUNT(*) FROM sat_notice_read WHERE  siteid = t1.siteid AND sat_noticeid = t1.sat_noticeid)>0 THEN '已读' ELSE '未读' END) readstatus,
+		(CASE WHEN  (SELECT COUNT(*) FROM sat_notice_read WHERE  siteid = t1.siteid AND sat_noticeid = t1.sat_noticeid  and createuserid =$userid$)>0 THEN '已读' ELSE '未读' END) readstatus,
     (SELECT COUNT(*) FROM sat_notice_read WHERE  siteid = t1.siteid AND sat_noticeid = t1.sat_noticeid) readpersoncount,
     (SELECT count(*)  FROM sys_attachment_links WHERE   siteid = t1.siteid AND ownerid = t1.sat_noticeid AND ownertable = 'sat_notice' ) attachmentcount
 FROM

src/custom/restcontroller/webmanage/saletool/notice/SQL/通告详情查询.sql

@@ -15,7 +15,7 @@ SELECT
     t1.status,
     t1.isontop,
     t1.readcount,
-		(CASE WHEN  (SELECT COUNT(*) FROM sat_notice_read WHERE  siteid = t1.siteid AND sat_noticeid = t1.sat_noticeid)>0 THEN '已读' ELSE '未读' END) readstatus,
+		(CASE WHEN  (SELECT COUNT(*) FROM sat_notice_read WHERE  siteid = t1.siteid AND sat_noticeid = t1.sat_noticeid and createuserid =$userid$)>0 THEN '已读' ELSE '未读' END) readstatus,
     (SELECT COUNT(*) FROM sat_notice_read WHERE  siteid = t1.siteid AND sat_noticeid = t1.sat_noticeid) readpersoncount,
     (SELECT count(*) FROM sys_attachment_links WHERE   siteid = t1.siteid AND ownerid = t1.sat_noticeid AND ownertable = 'sat_notice' ) attachmentcount
 FROM

src/custom/restcontroller/webmanage/saletool/notice/notice.java

@@ -140,6 +140,7 @@ public class notice extends Controller {
         SQLFactory sqlFactory = new SQLFactory(this, "通告列表查询", pageSize, pageNumber, pageSorting);
         sqlFactory.addParameter_SQL("where", where);
         sqlFactory.addParameter("siteid", siteid);
+        sqlFactory.addParameter("userid", userid);
         Rows rows = dbConnect.runSqlQuery(sqlFactory);
 
         ArrayList<Long> ids = rows.toArrayList("sat_noticeid", new ArrayList<Long>());
@@ -175,6 +176,7 @@ public class notice extends Controller {
         addReadRecord(sat_noticeid);
         SQLFactory sqlFactory = new SQLFactory(this, "通告详情查询");
         sqlFactory.addParameter("sat_noticeid", sat_noticeid);
+        sqlFactory.addParameter("userid", userid);
         Rows rows = dbConnect.runSqlQuery(sqlFactory);
 
         ArrayList<Long> ids = rows.toArrayList("sat_noticeid", new ArrayList<Long>());