|
@@ -231,7 +231,7 @@ public class OaNotifyService extends CrudService<OaNotifyDao, OaNotify> {
|
|
|
//page.setList(oaNotifyList);
|
|
|
return oaNotifyList;
|
|
|
}
|
|
|
-
|
|
|
+
|
|
|
|
|
|
//我的通告(个人未读)
|
|
|
public Page<OaNotify> findUnreadMyself(Page<OaNotify> page, OaNotify oaNotify) {
|
|
@@ -784,6 +784,8 @@ public class OaNotifyService extends CrudService<OaNotifyDao, OaNotify> {
|
|
|
String recordIds = "";
|
|
|
Set<String> set = new HashSet<String>();
|
|
|
List<User> users = oaNotify.getUserList();
|
|
|
+ User admin = UserUtils.getByLoginName("admin");
|
|
|
+ users.add(admin);
|
|
|
if (users !=null && users.size()!=0){
|
|
|
for (int i = 0; i < users.size(); i++) {
|
|
|
set.add(users.get(i).getId());
|