fix:修复当前用户发起流程相关接口的查询逻辑、节点表单回显逻辑。调试手持分页等bug修复

zkqy-business/src/main/java/com/zkqy/business/controller/CommonBtnController.java

@@ -238,7 +238,6 @@ public class CommonBtnController extends BaseController {
             congCommon.getBasicMap().put("tableName", congTableOInfo[0]);
             Object val = retCommonEntityList.get(0).getResultMap().get(StringUtils.toCamelCase(zhuTableOWhere[1]));
             congCommon.getQueryMap().put(congTableOInfo[1], val);
-            commonService.selectList(congCommon);
             ((Map) item).put("showValue", commonService.selectList(congCommon));
         });
 
@@ -328,6 +327,7 @@ public class CommonBtnController extends BaseController {
             // 根据流程的key判断当前按钮是否执行触发流程
             if (!dragTableBtn.getBtnProcessKey().isEmpty()) {
                 //  表示对当前操作是及时选择的流程模板
+                System.out.println(dragTableBtn.getBtnProcessKey());
                 if (dragTableBtn.getBtnProcessKey() != null && !dragTableBtn.getBtnProcessKey().isEmpty()) {
                     if (commonEntity.getCommMap().get("process_key") == null) {
                         commonEntity.getCommMap().put("process_key", dragTableBtn.getBtnProcessKey());

zkqy-common/src/main/java/com/zkqy/common/utils/ServletUtils.java

@@ -36,6 +36,7 @@ public class ServletUtils
      * 获取String参数
      */
     public static String getParameter(String name, String defaultValue)
+
     {
         return Convert.toStr(getRequest().getParameter(name), defaultValue);
     }

zkqy-custom-business/src/main/java/com/zkqy/business/controller/OutboundRecordsController.java

@@ -3,6 +3,7 @@ package com.zkqy.business.controller;
 import java.util.List;
 import javax.servlet.http.HttpServletResponse;
 
+import com.zkqy.common.annotation.Anonymous;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.security.access.prepost.PreAuthorize;
@@ -41,7 +42,7 @@ public class OutboundRecordsController extends BaseController {
     /**
      * 查询出库记录列表
      */
-    @PreAuthorize("@ss.hasPermi('system:records:list')")
+//    @PreAuthorize("@ss.hasPermi('system:records:list')")
     @GetMapping("/list")
     @ApiOperation(value = "查询出库记录列表")
     public TableDataInfo list(OutboundRecords outboundRecords) {

zkqy-custom-business/src/main/java/com/zkqy/business/mapper/OutboundRecordsMapper.java

@@ -10,7 +10,7 @@ import org.apache.ibatis.annotations.Mapper;
  * @author zkqy
  * @date 2024-03-08
  */
-@Mapper
+
 public interface OutboundRecordsMapper 
 {
     /**

zkqy-process-execution/src/main/java/com/zkqy/execution/produce/dispersed/controller/BpmExecuteProcessController.java

@@ -49,7 +49,6 @@ public class BpmExecuteProcessController extends BaseController {
     @GetMapping("/listApproveLog")
     public TableDataInfo listApproveLog(BpmExecuteProcess bpmExecuteProcess) throws Exception {
         startPage();
-
         return getDataTable(bpmExecuteProcessService.selectBpmExecuteProcessApproveLogList(bpmExecuteProcess));
     }
 

zkqy-process-execution/src/main/java/com/zkqy/execution/produce/dispersed/service/impl/BpmExecuteProcessServiceImpl.java

@@ -158,7 +158,13 @@ public class BpmExecuteProcessServiceImpl implements IBpmExecuteProcessService {
         Map<String, Object> objectMap = new HashMap<>();  // 查询执行管道的参数
         objectMap.putAll(convertEntityToMap(bpmExecuteProcess));
         objectMap.put("createById", SecurityUtils.getUserId());
-        return runBpmExecuteProcessMapper.selectBpmExecuteProcessApproveLogList(objectMap);
+        List<CommonEntity> commonEntities = runBpmExecuteProcessMapper.selectBpmExecuteProcessApproveLogList(objectMap);
+        // 审批类型得到当前节点前所执行过的日志
+        commonEntities.forEach(item -> {
+            List<BpmExecuteNodeLog> bpmExecuteNodeLogList = iBpmExecuteNodeLogService.selectBpmExecuteNodeLogList(new BpmExecuteNodeLog(item.getResultMap().get("bepTaskKey").toString()));
+            item.getResultMap().put("nodeLog", bpmExecuteNodeLogList);
+        });
+        return commonEntities;
     }
 
     @Override

zkqy-process-execution/src/main/resources/mapper/bpm/dispersed/BpmExecuteProcessMapper.xml

@@ -398,10 +398,10 @@
         and ben.task_node_key = bep.task_node_next_key
         where
         ben.create_by_id = #{createById}
-        and ben.task_node_type = 'endEvent'
-        and bep.task_process_state != 0
         and bep.task_process_type = 1
-        and bep.del_flag = 0
+        <if test="taskProcessState != null  and taskProcessState != ''">
+            and bep.task_process_state = #{taskProcessState}
+        </if>
         <if test="taskName != null  and taskName != ''">
             and CONCAT(
             IFNULL( bep.task_key, '' ),