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("用户名或者密码不正确");
             }
         }

src/main/resources/views/platform/flow/design/index.html

@@ -38,6 +38,7 @@ layout("/layouts/platform.html"){
         <el-card shadow="never">
             <table-tool>
                 <el-button type="primary" @click="onAdd" size="small" icon="el-icon-plus">新增</el-button>
+                <el-button type="primary" @click="onUpdate" size="small" icon="el-icon-plus">更新</el-button>
             </table-tool>
             <el-table :data="tableData" @sort-change="pageOrder" style="width: 100%">
                 <el-table-column type="index" width="50px" label="序号" :index="indexMethod"></el-table-column>
@@ -146,6 +147,9 @@ layout("/layouts/platform.html"){
             }
         },
         methods: {
+            onUpdate(){
+                this.$axios.post(loc()+"/onUpdate")
+            },
             onAdd() {
                 this.formData = {}
                 this.dialogVisible = true

src/test/java/com/budwk/app/Test.java

@@ -1,50 +0,0 @@
-package com.budwk.app;
-
-
-import cn.hutool.core.codec.Base64;
-import cn.hutool.core.util.CharsetUtil;
-import cn.hutool.crypto.digest.DigestUtil;
-import cn.hutool.http.HttpRequest;
-import cn.hutool.http.HttpUtil;
-import cn.hutool.json.JSONArray;
-import cn.hutool.json.JSONObject;
-import cn.hutool.json.JSONUtil;
-import com.budwk.app.base.sms.impl.njupt.SmsNjuptServiceImpl;
-
-import java.nio.charset.StandardCharsets;
-import java.security.MessageDigest;
-import java.security.NoSuchAlgorithmException;
-import java.util.List;
-
-public class Test {
-
-    public static void main(String[] args) {
-        String appId = "1926887238437818370";
-        String secret = "32df31fcf4fc43f9a647ee1f47134f36";
-        long ts = System.currentTimeMillis();
-
-        String sign = Base64.encode(DigestUtil.md5Hex(appId + secret + ts, CharsetUtil.CHARSET_UTF_8));
-
-        HttpRequest httpRequest = HttpUtil.createPost("https://sjzcpt.nnu.edu.cn/cdsp/data-api/v2/DS0005");
-        httpRequest.header("Content-Type", "application/json");
-        httpRequest.header("appId", appId);
-        httpRequest.header("timestamp", String.valueOf(ts));
-        httpRequest.header("sign", sign);
-        httpRequest.body("{}");
-        String body = httpRequest.execute().body();
-        System.out.println(body);
-
-//        JSONObject entries = JSONUtil.parseObj(body);
-//        JSONArray value = entries.getJSONArray("value");
-//
-//        for (Object o : value) {
-//            JSONObject jsonObject = (JSONObject) o;
-//        }
-
-
-
-    }
-
-
-
-}