通过表单id查询流程记录

oa-back/ruoyi-admin/src/main/java/com/ruoyi/web/controller/oa/CmcDeviceApprovalController.java

@@ -168,7 +168,7 @@ public class CmcDeviceApprovalController extends BaseController
         }
         if (formDataJson.getDate("returnDate") != null) {
             cmcDeviceApproval.setRemark(formDataJson.getString("remark"));
-            if (formDataJson.getJSONArray("repairDevices").size() > 0) {
+            if (formDataJson.getDate("repairDevices") != null && formDataJson.getJSONArray("repairDevices").size() > 0) {
                 String deviceString = formDataJson.getString("repairDevices").substring(1, formDataJson.getString("repairDevices").length() - 1);
                 cmcDeviceApproval.setRepairDevices(deviceString);
                 String[] devices = deviceString.split(",");
@@ -178,7 +178,7 @@ public class CmcDeviceApprovalController extends BaseController
                     cmcDeviceService.updateCmcDevice(cmcDevice);
                 }
             }
-            if (formDataJson.getJSONArray("returnDevices").size() > 0) {
+            if (formDataJson.getDate("returnDevices") != null && formDataJson.getJSONArray("returnDevices").size() > 0) {
                 String deviceString = formDataJson.getString("returnDevices").substring(1, formDataJson.getString("returnDevices").length() - 1);
                 cmcDeviceApproval.setReturnDevices(deviceString);
                 String[] devices = deviceString.split(",");

oa-back/ruoyi-flowable/src/main/java/com/ruoyi/flowable/service/impl/FlowTaskServiceImpl.java

@@ -1392,10 +1392,10 @@ public class FlowTaskServiceImpl extends FlowServiceFactory implements IFlowTask
      * @return
      */
     @Override
-    public AjaxResult flowXmlAndNodeByFormIdAndName(String formId, String name) {
+    public AjaxResult flowXmlAndNodeByFormIdAndName(String formId, String id) {
         try {
             List<FlowVarInst> flowVarInst = flowVarInstMapper.selectProcInstByVar(formId);
-            List<FlowProcDefDto> flowProcDefList = flowDeployMapper.selectDeployList(name);
+            List<FlowProcDefDto> flowProcDefList = flowDeployMapper.selectDeployListById(id);
             AjaxResult result = flowXmlAndNode(flowVarInst.get(0).getProcInstId(), flowProcDefList.get(0).getDeploymentId());
             if (result.isSuccess()) {
                 result.put("procInsId", flowVarInst.get(0).getProcInstId());

oa-back/ruoyi-framework/src/main/java/com/ruoyi/framework/web/service/TokenService.java

@@ -49,7 +49,7 @@ public class TokenService
 
     protected static final long MILLIS_MINUTE = 60 * MILLIS_SECOND;
 
-    private static final Long MILLIS_MINUTE_TEN = 20 * 60 * 1000L;
+    private static final Long MILLIS_MINUTE_TEN = 120 * 60 * 1000L;
 
     @Autowired
     private RedisCache redisCache;

oa-back/ruoyi-system/src/main/java/com/ruoyi/system/mapper/FlowDeployMapper.java

@@ -19,4 +19,11 @@ public interface FlowDeployMapper {
      * @return
      */
     List<FlowProcDefDto> selectDeployList(String name);
+
+    /**
+     * 流程定义列表
+     * @param id
+     * @return
+     */
+    List<FlowProcDefDto> selectDeployListById(String id);
 }

oa-back/ruoyi-system/src/main/resources/mapper/flowable/FlowDeployMapper.xml

@@ -27,5 +27,27 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         order by rd.id_ asc
     </select>
 
+    <select id="selectDeployListById" resultType="com.ruoyi.system.domain.FlowProcDefDto">
+
+        SELECT
+            rp.id_ as id,
+            rp.deployment_id_ as deploymentId,
+            rd.name_ as name,
+            rd.category_ as category,
+            rp.key_ as flowKey,
+            rp.version_ as version,
+            rp.suspension_state_ as suspensionState,
+            rd.deploy_time_  as deploymentTime
+        FROM
+            ACT_RE_PROCDEF rp
+                LEFT JOIN ACT_RE_DEPLOYMENT rd ON rp.deployment_id_ = rd.id_
+        <where>
+            <if test="id != null and id != ''">
+               and rd.id_ like concat('%', #{id}, '%')
+            </if>
+        </where>
+        order by rd.id_ asc
+    </select>
+
 
 </mapper>