ソースを参照

解决草稿箱中删除后,原本流程数据还存在的问题

dzx 1 年間 前
コミット
fba9bf3a1b

+ 6 - 6
src/main/java/com/xjrsoft/module/teacher/service/impl/TeacherbaseManagerServiceImpl.java

@@ -134,13 +134,13 @@ public class TeacherbaseManagerServiceImpl extends MPJBaseServiceImpl<XjrUserMap
         userRoleRelation.setRoleId(RoleEnum.TEACHER.getCode());
         userRoleRelationMapper.insert(userRoleRelation);
 
-        CompletableFuture.runAsync(() -> {
-            List<User> list = userService.list();
-            redisUtil.set(GlobalConstant.USER_CACHE_KEY, list);
+        List<User> list = userService.list();
+        list.add(BeanUtil.toBean(xjrUser, User.class));
+        redisUtil.set(GlobalConstant.USER_CACHE_KEY, list);
 
-            List<UserDeptRelation> deptRelationList = userDeptRelationMapper.selectList(Wrappers.lambdaQuery(UserDeptRelation.class));
-            redisUtil.set(GlobalConstant.USER_DEPT_RELATION_CACHE_KEY, deptRelationList);
-        });
+
+        List<UserDeptRelation> deptRelationList = userDeptRelationMapper.selectList(Wrappers.lambdaQuery(UserDeptRelation.class));
+        redisUtil.set(GlobalConstant.USER_DEPT_RELATION_CACHE_KEY, deptRelationList);
         return true;
     }
 

+ 1 - 1
src/main/java/com/xjrsoft/module/workflow/service/impl/WorkflowExecuteServiceImpl.java

@@ -4125,7 +4125,7 @@ public class WorkflowExecuteServiceImpl implements IWorkflowExecuteService {
             WorkflowSchema schema = workflowSchemaMapper.selectById(workflowDraft.getSchemaId());
             JsonObject JsonContent = parser.parse(schema.getJsonContent()).getAsJsonObject();
             JsonObject processConfig = JsonContent.get("processConfig").getAsJsonObject();
-            String formId = processConfig.get("formInitConfig").getAsJsonObject().get("formId").getAsString();
+            String formId = processConfig.get("defaultFormList").getAsJsonArray().get(0).getAsJsonObject().get("formId").getAsString();
             FormTemplate formTemplate = formTemplateMapper.selectById(formId);
 
             JsonObject formJson = parser.parse(formTemplate.getFormJson()).getAsJsonObject();