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

refactor(hr): 移除关键行为评价报表中的组织权限过滤逻辑

- 移除了 getAuthorizedOrgIds() 方法调用
- 简化 queryKeyBeHavEvalProjRsltDataSet 方法,移除组织ID参数
- 简化 getUniqueProjectInfo 方法,移除组织ID参数
- 移除 createOrgFilter 方法及其相关过滤逻辑
- 更新查询过滤器为通用条件 "1=1"
- 移除了与组织权限相关的过滤代码
wyc 1 неделя назад
Родитель
Сommit
d4626ba5fc

+ 5 - 19
code/hr/nckd-jxccl-hr/src/main/java/nckd/jxccl/hr/psms/plugin/form/other/report/KeyBeHavEvalReptQueryPlugin.java

@@ -66,10 +66,10 @@ public class KeyBeHavEvalReptQueryPlugin extends AbstractReportListDataPlugin im
     public DataSet query(ReportQueryParam reportQueryParam, Object o) throws Throwable {
 
         // 1. 获取权限范围内的组织ID
-        List<Long> authorizedOrgIds = getAuthorizedOrgIds();
+//        List<Long> authorizedOrgIds = getAuthorizedOrgIds();
         
         // 2. 查询关键行为评价项目结果数据
-        DataSet keyBeHavEvalProjRsltDataSet = queryKeyBeHavEvalProjRsltDataSet(authorizedOrgIds);
+        DataSet keyBeHavEvalProjRsltDataSet = queryKeyBeHavEvalProjRsltDataSet();
         
         // 3. 获取唯一项目编号(需要用于动态列的项目)
         Set<String> uniqueProjectNumbers = extractUniqueProjectNumbers(keyBeHavEvalProjRsltDataSet);
@@ -107,11 +107,9 @@ public class KeyBeHavEvalReptQueryPlugin extends AbstractReportListDataPlugin im
      */
     @Override
     public List<AbstractReportColumn> getColumns(List<AbstractReportColumn> columns) throws Throwable {
-        // 获取权限范围内的组织ID
-        List<Long> authorizedOrgIds = getAuthorizedOrgIds();
         
         // 获取唯一项目信息
-        List<ProjectInfo> projectInfoList = getUniqueProjectInfo(authorizedOrgIds);
+        List<ProjectInfo> projectInfoList = getUniqueProjectInfo();
         
         // 为每个唯一项目创建列
         for (ProjectInfo projectInfo : projectInfoList) {
@@ -153,7 +151,7 @@ public class KeyBeHavEvalReptQueryPlugin extends AbstractReportListDataPlugin im
     /**
      * 获取项目信息列表
      */
-    private List<ProjectInfo> getUniqueProjectInfo(List<Long> orgIds) {
+    private List<ProjectInfo> getUniqueProjectInfo() {
         QueryFieldBuilder resultFieldBuilder = createResultFieldBuilder();
 //        QFilter filter = createOrgFilter(orgIds);
 
@@ -206,7 +204,7 @@ public class KeyBeHavEvalReptQueryPlugin extends AbstractReportListDataPlugin im
     /**
      * 查询关键行为评价项目结果数据集
      */
-    private DataSet queryKeyBeHavEvalProjRsltDataSet(List<Long> orgIds) {
+    private DataSet queryKeyBeHavEvalProjRsltDataSet() {
         QueryFieldBuilder resultFieldBuilder = createResultFieldBuilder();
 //        QFilter filter = createOrgFilter(orgIds);
         QFilter filter = QFilter.of("1=1");
@@ -235,18 +233,6 @@ public class KeyBeHavEvalReptQueryPlugin extends AbstractReportListDataPlugin im
                 .add(PositionStructureConstant.NCKD_RESULT);
     }
 
-    /**
-     * 创建组织过滤器
-     */
-    private QFilter createOrgFilter(List<Long> orgIds) {
-        QFilter filter = QFilter.of("1=1");
-        if (orgIds != null && !orgIds.isEmpty()) {
-            filter.and(String.join(".",PositionStructureConstant.NCKD_KEYBEHAVCONFENTRY,"nckd_keybehavconf",FormConstant.NCKD_ORG, FormConstant.ID_KEY), QCP.in, orgIds);
-            filter.and(String.join(".",FormConstant.NCKD_PERSON,FormConstant.HRPI_EMPPOSORGREL, FormConstant.ADMINORG), QCP.in, orgIds);
-
-        }
-        return filter;
-    }
 
     /**
      * 提取唯一的项目编号