Просмотр исходного кода

fix(hr): 修复未定级人员查询列表的过滤条件

- 移除了主组织分配的过滤条件
- 添加了全职任职的过滤条件,确保只查询岗位类别为"1010_S"的人员
- 保持了在职人员和最新记录的过滤逻辑
wyc 2 недель назад
Родитель
Сommit
e4ba807ff8

+ 2 - 2
code/hr/nckd-jxccl-hr/src/main/java/nckd/jxccl/hr/psms/plugin/form/initial/UngradedPersonQueryListPlugin.java

@@ -41,11 +41,11 @@ public class UngradedPersonQueryListPlugin extends AbstractListPlugin implements
         //只查询没有初定的人员
         QFilter filter = new QFilter(String.join(".", PositionStructureConstant.PERSONPOSFILE_ENTITYID, FormConstant.ID_KEY), QCP.is_null, null)
                 //组织分配为主组织分配的人员
-                .and(String.join(".",FormConstant.ASSIGNMENT_ENTITYID, FormConstant.IS_PRIMARY), QCP.equals,EnableEnum.YES.getCode())
                 .and(FormConstant.IS_SEQLATESTRECORD, QCP.equals,EnableEnum.YES.getCode())
                 .and(FormConstant.IS_DELETED, QCP.equals,EnableEnum.NO.getCode())
                 .and(FormConstant.IS_PRIMARY, QCP.equals,EnableEnum.YES.getCode())
-
+                //全职任职
+                .and(String.join(".", FormConstant.POSTYPE,FormConstant.POSTCATEGORY,FormConstant.NUMBER_KEY),QCP.equals,"1010_S")
                 //只查询在职人员
                 .and(String.join(".",FormConstant.HRPI_EMPENTREL, FormConstant.LABOR_REL_STATUS,FormConstant.IS_HIRED), QCP.equals,EnableEnum.YES.getCode());
         setFilterEvent.addCustomQFilter(filter);