update 测试流程

laws-module-system/src/main/java/com/jero/modules/system/service/impl/SysBaseApiImpl.java

@@ -1228,7 +1228,7 @@ public class SysBaseApiImpl implements ISysBaseAPI {
 	}
 
 	@Override
-	//@Cacheable(value = CacheConstant.SYS_DICT_CACHE,key = "#id", unless = "#result == null ")
+	@Cacheable(value = CacheConstant.SYS_DICT_CACHE,key = "#id", unless = "#result == null ")
 	public String translateUserRealNameFromTable(String id) {
 		return userMapper.translateUserRealNameFromTable(id);
 	}

laws-modules/src/main/java/com/jero/modules/activiti/common/ActivitiCommon.java

@@ -8,6 +8,5 @@ public class ActivitiCommon {
     public static final String PASS = "pass";
 
     public static final String MAIN_INSTANCE_ID = "mainInstanceId";
-    public static final String PARENT_INSTANCE_ID = "parentInstanceId";
     public static final String PARENT_TASK_ID = "parentTaskId";
 }

laws-modules/src/main/java/com/jero/modules/activiti/listener/MyGlobalEventListener.java

@@ -151,7 +151,6 @@ public class MyGlobalEventListener implements ActivitiEventListener {
         String mainInstanceId = (String) variables.get(ActivitiCommon.MAIN_INSTANCE_ID);
         String processInstanceId = mainInstanceId != null ? mainInstanceId : delegateTask.getProcessInstanceId();
 
-        String parentInstanceId = (String) variables.get(ActivitiCommon.PARENT_INSTANCE_ID);
         String parentTaskId = (String) variables.get(ActivitiCommon.PARENT_TASK_ID);
         //新增待审批记录
         ProcessApprovalRecord approvalRecord = new ProcessApprovalRecord();
@@ -333,7 +332,6 @@ public class MyGlobalEventListener implements ActivitiEventListener {
         wrapper.set(ProcessAll::getOverTime, between.toString());
         processAllService.update(wrapper);
         //如果有父id，判断所有子流程是否都完成，如果都完成，那么父流程的任务开始流转
-        String parentInstanceId = (String) execution.getVariable(ActivitiCommon.PARENT_INSTANCE_ID);
         String parentTaskId = (String) execution.getVariable(ActivitiCommon.PARENT_TASK_ID);
         if (StringUtils.isNotBlank(parentTaskId)){
             int i = processAllService.countByParentTaskId(parentTaskId);

laws-modules/src/main/java/com/jero/modules/activiti/process/common/entity/ProcessDraft.java

@@ -65,12 +65,6 @@ public class ProcessDraft implements Serializable {
     @ApiModelProperty(value = "流程类型")
     private String prcName;
 
-    /**
-     * 主流程实例id
-     */
-    @ApiModelProperty(value="主流程实例id")
-    private String mainInstanceId;
-
     /**
      * 流程实例id
      */

laws-modules/src/main/java/com/jero/modules/activiti/process/demo/service/ProcessDemoService.java

@@ -206,7 +206,6 @@ public class ProcessDemoService extends ServiceImpl<ProcessDemoMapper, ProcessDe
         //保存父子关联信息
         Map<String, Object> variables = new HashMap<>();
         variables.put(ActivitiCommon.MAIN_INSTANCE_ID, mainInstanceId != null ? mainInstanceId : processInstanceId);
-        variables.put(ActivitiCommon.PARENT_INSTANCE_ID, processInstanceId);
         variables.put(ActivitiCommon.PARENT_TASK_ID, taskId);
 
         switch (taskDefinitionKey) {