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

fix(report): 修复关键行为评估报表查询插件的数据权限过滤问题

- 修改数据权限过滤逻辑,直接使用dataRule对象而非提取其值
- 添加mainTableDataSet.print(true)用于调试输出
- 优化queryMainTableDataSet方法中的代码格式
wyc 6 дней назад
Родитель
Сommit
69982444db

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

@@ -85,8 +85,8 @@ public class KeyBeHavEvalReptQueryPlugin extends AbstractReportListDataPlugin im
                 RequestContext.get().getCurrUserId(), "nckd_psmsfile", PositionStructureConstant.PERSONPOSFILE_ENTITYID,
                 PermItemConst.ITEM_VIEW, new HashMap<>());
         if (dataRule != null) {
-            Object value = dataRule.getValue();
-            qFilter.and(String.join(".",FormConstant.NCKD_PERSON,FormConstant.HRPI_EMPPOSORGREL, FormConstant.ADMINORG), QCP.in, value);
+//            Object value = dataRule.getValue();
+            qFilter.and(dataRule);
         }
 
         processFastFilter(reportQueryParam, qFilter);
@@ -94,6 +94,7 @@ public class KeyBeHavEvalReptQueryPlugin extends AbstractReportListDataPlugin im
         processFilter(reportQueryParam, qFilter);
 
         DataSet mainTableDataSet = queryMainTableDataSet(qFilter);
+        mainTableDataSet.print(true);
 
         // 6. 关联主表和行转列结果
         DataSet finalResultDataSet = joinMainAndPivotData(mainTableDataSet, pivotResultDataSet);
@@ -287,6 +288,8 @@ public class KeyBeHavEvalReptQueryPlugin extends AbstractReportListDataPlugin im
      * 查询主表数据
      */
     private DataSet queryMainTableDataSet(QFilter qFilter) {
+
+
         QueryFieldBuilder queryFieldBuilder = buildQueryFieldBuilder();
         return QueryServiceHelper.queryDataSet("KeyBeHavEvalReptQueryPlugin", 
                 PositionStructureConstant.KEYBEHAVEVAL_ENTITYID,