通告列表报错修复

src/custom/restcontroller/ClientUserInfo.java

@@ -102,9 +102,7 @@ public class ClientUserInfo extends UserInfo {
             return new ArrayList<>();
         }
         Rows rows = controller.dbConnect.runSqlQuery("select distinct sa_saleareaid from sys_enterprise_tradefield where siteid='" + getSiteId() + "' and sys_enterpriseid=" + getEnterpriseId());
-        ArrayList<Long> sa_saleareaids = rows.toArrayList("sa_saleareaid", new ArrayList<>());
-        sa_saleareaids.add(0l);
-        return sa_saleareaids;
+        return rows.toArrayList("sa_saleareaid", new ArrayList<>());
     }
 
     public Row getReportHrRow() throws YosException {

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

@@ -63,7 +63,9 @@ public class notice extends Controller {
         querySQL.addQueryFields("readpersoncount","(SELECT COUNT(*) FROM sat_notice_read WHERE  siteid = t1.siteid AND sat_noticeid = t1.sat_noticeid)");
         querySQL.addQueryFields("attachmentcount","(SELECT count(*)  FROM sys_attachment_links WHERE   siteid = t1.siteid AND ownerid = t1.sat_noticeid AND ownertable = 'sat_notice' )");
         querySQL.setSiteid(siteid);
-        querySQL.setWhere("t1.sat_noticeid IN (SELECT sat_noticeid FROM sat_notice_auth WHERE (departmentid ='"+departmentid+"' AND isonlymanager=0) OR (EXISTS(SELECT * FROM sys_hr WHERE isleader=1 AND departmentid  ='"+departmentid+"' AND hrid  ='"+hrid+"') AND isonlymanager=1)  OR hrid='"+hrid+"' OR sa_agentsid =  '"+userInfo.getAgentID()+"' OR sa_saleareaid in  "+userInfo.getSaleAreaIds().toString().replace("[", "(").replace("]", ")")+")");
+        ArrayList<Long> AreaIds = userInfo.getSaleAreaIds();
+        AreaIds.add(0l);
+        querySQL.setWhere("t1.sat_noticeid IN (SELECT sat_noticeid FROM sat_notice_auth WHERE (departmentid ='"+departmentid+"' AND isonlymanager=0) OR (EXISTS(SELECT * FROM sys_hr WHERE isleader=1 AND departmentid  ='"+departmentid+"' AND hrid  ='"+hrid+"') AND isonlymanager=1)  OR hrid='"+hrid+"' OR sa_agentsid =  '"+userInfo.getAgentID()+"' OR sa_saleareaid in  "+AreaIds.toString().replace("[", "(").replace("]", ")")+")");
         querySQL.setWhere("t1.status='发布'");
         querySQL.setWhere(where);
         querySQL.setPage(pageSize, pageNumber);