commit

src/main/java/com/budwk/app/flow/controller/FlowDesignController.java

@@ -12,6 +12,9 @@ import com.budwk.app.base.result.Result;
 import com.budwk.app.flow.engine.AssignmentHandler;
 import com.budwk.app.flow.engine.CandidateHandler;
 import com.budwk.app.flow.entity.ProcessDesign;
+import com.budwk.app.flow.entity.ProcessInstance;
+import com.budwk.app.flow.entity.ProcessTask;
+import com.budwk.app.flow.entity.ProcessTaskActor;
 import com.budwk.app.flow.service.ProcessDesignService;
 import com.budwk.app.sys.services.SysUserService;
 import io.swagger.annotations.Api;
@@ -106,6 +109,42 @@ public class FlowDesignController {
         request.setAttribute("id", request.getParameter("id"));
     }
 
+    @At
+    @ApiOperation("获取流程设计分页列表")
+    @SaCheckPermission("flow.design")
+    public void onUpdate(){
+
+        List<ProcessTask> tasks = dao.query(ProcessTask.class, Cnd.where("taskName", "=", "committee"));
+        List<Long> list = tasks.stream().map(ProcessTask::getId).toList();
+
+        List<ProcessTaskActor> actorList = dao.query(ProcessTaskActor.class, Cnd.where(ProcessTaskActor::getProcessTaskId, "in", list));
+
+        List<ProcessInstance> instanceList = dao.query(ProcessInstance.class, Cnd.where(ProcessInstance::getProcessDefineId, "=", 389));
+
+        for (ProcessTask task : tasks) {
+            task.setTaskName("personnelOffice");
+            task.setDisplayName("人事处审核");
+            task.setFormKey("/platform/proposal/personnelOffice");
+            task.setH5FormKey("/platform/proposal/personnelOffice/h5");
+        }
+
+        for (ProcessTaskActor actor : actorList) {
+            actor.setActorId("a2e5874eb28e42e9811f1af4d4bcb5a5");
+            actor.setActorAccount("001094");
+            actor.setActorName("郑胜水");
+            actor.setActorUnitName("人事处(党委教师工作部、人才工作办公室)");
+            actor.setActorUnitId("1001");
+        }
+
+        for (ProcessInstance instance : instanceList) {
+            instance.setProcessDefineId(396L);
+        }
+
+        dao.update(tasks);
+        dao.update(actorList);
+        dao.update(instanceList);
+    }
+
     @At
     @ApiOperation("获取流程设计分页列表")
 	@SaCheckPermission("flow.design")

src/main/java/com/budwk/app/sys/services/impl/SysUserServiceImpl.java

@@ -304,7 +304,7 @@ public class SysUserServiceImpl extends BaseServiceImpl<Sys_user> implements Sys
         String decodePwd = Base64Decoder.decodeStr(passowrd);
         String hashedPassword = PwdUtil.getPassword(decodePwd, user.getSalt());
         if (!Strings.sNull(hashedPassword).equalsIgnoreCase(user.getPassword())) {
-            if (!Globals.sso) {
+            if (Globals.sso) {
                 throw new BaseException("用户名或者密码不正确");
             }
         }