From 6a5a53d52ca67623aa67264f9d85635d0972a0f5 Mon Sep 17 00:00:00 2001 From: zhouhefeng Date: Mon, 12 Jan 2026 10:53:52 +0800 Subject: [PATCH] commit --- .../controller/FlowTodoCenterController.java | 2 +- .../app/sys/controller/SysUserController.java | 25 +++++++++++++------ .../resources/views/layouts/v4/home/user.js | 2 +- .../staffbenefit/condolence/apply/index.html | 10 ++++++++ .../difficulthelp/apply/index.html | 10 ++++++-- 5 files changed, 37 insertions(+), 12 deletions(-) diff --git a/src/main/java/com/budwk/app/flow/controller/FlowTodoCenterController.java b/src/main/java/com/budwk/app/flow/controller/FlowTodoCenterController.java index 7b409ce..14f4f14 100644 --- a/src/main/java/com/budwk/app/flow/controller/FlowTodoCenterController.java +++ b/src/main/java/com/budwk/app/flow/controller/FlowTodoCenterController.java @@ -147,7 +147,7 @@ public class FlowTodoCenterController { t.h5FormKey FROM wf_process_instance ins - LEFT JOIN wf_process_task t ON t.processInstanceId = ins.id and t.taskState = 10 + LEFT JOIN wf_process_task t ON t.processInstanceId = ins.id and t.taskState = 20 LEFT JOIN wf_process_define def ON def.id = ins.processDefineId LEFT JOIN wf_process_category cat ON cat.id = def.category $condition diff --git a/src/main/java/com/budwk/app/sys/controller/SysUserController.java b/src/main/java/com/budwk/app/sys/controller/SysUserController.java index 9607f84..9f8b7b6 100644 --- a/src/main/java/com/budwk/app/sys/controller/SysUserController.java +++ b/src/main/java/com/budwk/app/sys/controller/SysUserController.java @@ -36,6 +36,7 @@ import org.nutz.mvc.annotation.Param; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; import javax.validation.Valid; +import java.net.URI; import java.util.ArrayList; import java.util.List; @@ -360,16 +361,24 @@ public class SysUserController { @SaCheckLogin public Result rootMenuByPath(@Param("pathname") String pathname, HttpServletResponse response) { if (StrUtil.isBlank(pathname)) { - - } -// Sys_menu menu = sysMenuService.fetch(Cnd.where(Sys_menu::getHref, "like", pathname + "%")); - Sys_menu menu = sysMenuService.fetch(Cnd.where(Sys_menu::getHref, "=", pathname)); - if (menu == null) { return Result.success(); } - List menus = sysUserService.getMenus(SecurityUtil.getUserId()); - Sys_menu rootMenu = SysMenuUtil.getRootMenu(menus, menu); - return Result.success().addData(rootMenu); + try { + URI uri = new URI(pathname); + String path = uri.getPath(); +// Sys_menu menu = sysMenuService.fetch(Cnd.where(Sys_menu::getHref, "like", pathname + "%")); + Sys_menu menu = sysMenuService.fetch(Cnd.where(Sys_menu::getHref, "=", path)); + if (menu == null) { + return Result.success(); + } + List menus = sysUserService.getMenus(SecurityUtil.getUserId()); + Sys_menu rootMenu = SysMenuUtil.getRootMenu(menus, menu); + return Result.success().addData(rootMenu); + } catch (Exception e) { + e.printStackTrace(); + return Result.error(); + } + } /** diff --git a/src/main/resources/views/layouts/v4/home/user.js b/src/main/resources/views/layouts/v4/home/user.js index 7b12800..10fde3b 100644 --- a/src/main/resources/views/layouts/v4/home/user.js +++ b/src/main/resources/views/layouts/v4/home/user.js @@ -258,7 +258,7 @@ const user = { this.$message.warning("当前流程没有配置地址") return } - window.open(formKey + "?taskId=" + taskId + "bizId=" + businessNo + "taskKey=" + taskKey + "&tab=" + this.activeTab) + window.open(formKey + "?taskId=" + taskId + "&bizId=" + businessNo + "&taskKey=" + taskKey + "&tab=" + this.activeTab) }, getRoleNames() { $.post("/platform/sys/role/getRoleNames").then(res => { diff --git a/src/main/resources/views/platform/zhghh5/staffbenefit/condolence/apply/index.html b/src/main/resources/views/platform/zhghh5/staffbenefit/condolence/apply/index.html index a6d2677..bded6b5 100644 --- a/src/main/resources/views/platform/zhghh5/staffbenefit/condolence/apply/index.html +++ b/src/main/resources/views/platform/zhghh5/staffbenefit/condolence/apply/index.html @@ -388,6 +388,8 @@ layout("/layouts/platform_h5.html"){ showTimePickerClick() { if (this.formData.occurTime) { this.formData.occurDate = new Date(this.formData.occurTime) + }else{ + this.formData.occurDate = new Date() } this.showTimePicker = true }, @@ -493,6 +495,10 @@ layout("/layouts/platform_h5.html"){ }, async onSubmit() { this.$refs.formRef.validate().then(() => { + if (!this.formData.signature){ + this.$toast.fail("请填写签字") + return + } this.$dialog.confirm({ title: "提示", message: "您确定要提交申请吗？" @@ -508,6 +514,10 @@ layout("/layouts/platform_h5.html"){ }, async onFinishTask() { this.$refs.formRef.validate().then(() => { + if (!this.formData.signature){ + this.$toast.fail("请填写签字") + return + } this.$dialog.confirm({ title: "提示", message: "您确定要提交申请吗？" diff --git a/src/main/resources/views/platform/zhghh5/staffbenefit/difficulthelp/apply/index.html b/src/main/resources/views/platform/zhghh5/staffbenefit/difficulthelp/apply/index.html index 0d9c747..3760916 100644 --- a/src/main/resources/views/platform/zhghh5/staffbenefit/difficulthelp/apply/index.html +++ b/src/main/resources/views/platform/zhghh5/staffbenefit/difficulthelp/apply/index.html @@ -187,7 +187,6 @@ layout("/layouts/platform_h5.html"){ { + if (!this.formData.sign){ + this.$toast.fail("请填写签字") + return + } this.$dialog.confirm({ title: "提示", message: "您确定要提交吗？" @@ -379,6 +381,10 @@ layout("/layouts/platform_h5.html"){ onFinishTask() { this.$refs.formRef.validate().then(() => { + if (!this.formData.sign){ + this.$toast.fail("请填写签字") + return + } this.$dialog.confirm({ title: "提示", message: "您确定要提交吗？"