Merge remote-tracking branch 'origin/master'

code/hr/nckd-jxccl-hr/src/main/java/nckd/jxccl/hr/tsc/plugin/form/AnnouncementsListPlugin.java

@@ -92,13 +92,5 @@ public class AnnouncementsListPlugin extends AbstractListPlugin implements Plugi
 
     }
 
-    @Override
-    public void setFilter(SetFilterEvent e) {
-        super.setFilter(e);
-
-        QFilter dataRule = HRPermissionServiceHelper.getDataRule(
-                RequestContext.get().getCurrUserId(), "tsirm", FormConstant.NCKD_ANNOUNCEMENTS, PermissionStatus.View, new HashMap<>());
-        e.getQFilters().add(dataRule);
-    }
 
 }

code/hr/nckd-jxccl-hr/src/main/java/nckd/jxccl/hr/tsc/plugin/form/AnnouncementsTplListPlugin.java

@@ -34,10 +34,9 @@ public class AnnouncementsTplListPlugin extends AbstractListPlugin implements Pl
     @Override
     public void setFilter(SetFilterEvent e) {
         super.setFilter(e);
-        e.setMainOrgQFilter((QFilter)null);
         List<QFilter> qFilters = e.getQFilters();
         List<QFilter> qFilterList = null;
-        if(qFilters.get(0) != null) {
+        if(qFilters.size()>0 && qFilters.get(0) != null) {
             qFilterList = (List) qFilters.stream().filter((qFilter) -> {
                 return HRStringUtils.equals(qFilter.getProperty(), "id");
             }).collect(Collectors.toList());
@@ -64,6 +63,7 @@ public class AnnouncementsTplListPlugin extends AbstractListPlugin implements Pl
         if(empDyns != null && empDyns.length > 0){
             ///获取当前员工的行政组织长编码
             String adminOrgStructnumber = empDyns[0].getString("adminorg.structlongnumber");
+            System.out.println("empId:"+ empId + " adminOrgStructnumber:"+ adminOrgStructnumber);
             ///查询符合条件的公告
             Map<Long, String> announcementsMap = queryAnnouncementsByBillStatus();
             ///组织结构编码匹配，返回符合条件的公告
@@ -74,17 +74,20 @@ public class AnnouncementsTplListPlugin extends AbstractListPlugin implements Pl
 
         }
 
-        if (qFilterList != null && qFilterList.size() == 0 && qFilter != null) {
+        if (qFilterList == null  && qFilter != null) {
             qFilters.add(qFilter);
         }else{
             qFilter = new QFilter("id", QCP.equals, 10000000000000000L);
             qFilters.add(qFilter);
         }
+        QFilter adminOrgFilter = (QFilter)qFilterList.get(0);
+        System.out.println("qFilters:" + qFilters.toString() + " empId:"+ empId );
 
     }
 
     @Override
     public void filterColumnSetFilter(SetFilterEvent args) {
+
         super.filterColumnSetFilter(args);
     }