Merge branch 'refs/heads/feat-hr-psms_1.0'

code/swc/nckd-jxccl-swc/src/main/java/nckd/jxccl/swc/mas/plugin/form/empmgt/SubCoHeadServiceListPlugin.java

@@ -196,8 +196,8 @@ public class SubCoHeadServiceListPlugin extends AbstractListPlugin implements Pl
                             return false;
                         }
                         LocalDateTime changeTime = DateUtil.toLocalDateTime(record.getDate(MasConstant.NCKD_CHANGETIME));
-                        // 判断记录是否在当年范围内
-                        return  changeTime.getYear() <= beginYear.getYear();
+                        // 判断变动时间是否小于等于当前日期
+                        return  changeTime.isBefore(LocalDateTime.now()) || changeTime.isEqual(LocalDateTime.now());
                     })
                     .max(Comparator.comparing(record -> record.getDate(MasConstant.NCKD_CHANGETIME),
                             Comparator.nullsFirst(Comparator.naturalOrder())));

code/swc/nckd-jxccl-swc/src/main/java/nckd/jxccl/swc/mas/plugin/form/empmgt/TenurePersonListListPlugin.java

@@ -157,8 +157,8 @@ public class TenurePersonListListPlugin extends AbstractListPlugin implements Pl
                             return false;
                         }
                         LocalDateTime changeTime = DateUtil.toLocalDateTime(record.getDate(MasConstant.NCKD_CHANGETIME));
-                        // 判断记录是否在当年范围内
-                        return  changeTime.getYear() <= beginYear.getYear();
+                        // 判断变动时间是否小于等于当前日期
+                        return  changeTime.isBefore(LocalDateTime.now()) || changeTime.isEqual(LocalDateTime.now());
                     })
                     .max(Comparator.comparing(record -> record.getDate(MasConstant.NCKD_CHANGETIME),
                             Comparator.nullsFirst(Comparator.naturalOrder())));