From 3b538ec9e99eba44dbe707cbe047c8a82d38c288 Mon Sep 17 00:00:00 2001 From: XaoLi717 <144221124+XaoLi717@users.noreply.github.com> Date: Thu, 31 Oct 2024 14:27:45 +0800 Subject: [PATCH] =?UTF-8?q?=E6=95=B0=E6=8D=AE=E6=9D=83=E9=99=90?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../module/home/controller/admin/clgl/vo/ClglSaveReqVO.java | 5 +++++ .../config/homeDataPermissionConfiguration.java | 2 ++ 2 files changed, 7 insertions(+) diff --git a/yudao-module-home/yudao-module-home-biz/src/main/java/cn/iocoder/yudao/module/home/controller/admin/clgl/vo/ClglSaveReqVO.java b/yudao-module-home/yudao-module-home-biz/src/main/java/cn/iocoder/yudao/module/home/controller/admin/clgl/vo/ClglSaveReqVO.java index 0f0686f..0935cc9 100644 --- a/yudao-module-home/yudao-module-home-biz/src/main/java/cn/iocoder/yudao/module/home/controller/admin/clgl/vo/ClglSaveReqVO.java +++ b/yudao-module-home/yudao-module-home-biz/src/main/java/cn/iocoder/yudao/module/home/controller/admin/clgl/vo/ClglSaveReqVO.java @@ -14,6 +14,11 @@ public class ClglSaveReqVO { @Schema(description = "发起人自选审批人 Map", example = "{taskKey1: [1, 2]}") private Map> startUserSelectAssignees; + @AssertTrue(message = "结束时间，需要在开始时间之后") + public boolean isEndTimeValid2() { + return !getCarEnd().isBefore(getCarStart()); + } + @Schema(description = "id", requiredMode = Schema.RequiredMode.REQUIRED, example = "26309") private Long id; diff --git a/yudao-module-home/yudao-module-home-biz/src/main/java/cn/iocoder/yudao/module/home/framework/datapermission/config/homeDataPermissionConfiguration.java b/yudao-module-home/yudao-module-home-biz/src/main/java/cn/iocoder/yudao/module/home/framework/datapermission/config/homeDataPermissionConfiguration.java index 40e4d32..3ec1efa 100644 --- a/yudao-module-home/yudao-module-home-biz/src/main/java/cn/iocoder/yudao/module/home/framework/datapermission/config/homeDataPermissionConfiguration.java +++ b/yudao-module-home/yudao-module-home-biz/src/main/java/cn/iocoder/yudao/module/home/framework/datapermission/config/homeDataPermissionConfiguration.java @@ -2,6 +2,7 @@ package cn.iocoder.yudao.module.home.framework.datapermission.config; import cn.iocoder.yudao.framework.datapermission.core.rule.dept.DeptDataPermissionRuleCustomizer; import cn.iocoder.yudao.module.home.dal.dataobject.clgl.ClglDO; +import cn.iocoder.yudao.module.home.dal.dataobject.qjgl.QjglDO; import cn.iocoder.yudao.module.system.dal.dataobject.dept.DeptDO; import cn.iocoder.yudao.module.system.dal.dataobject.user.AdminUserDO; import org.springframework.context.annotation.Bean; @@ -20,6 +21,7 @@ public class homeDataPermissionConfiguration { return rule -> { // dept rule.addDeptColumn(ClglDO.class, "dept"); + rule.addDeptColumn(QjglDO.class, "dept_id"); // rule.addDeptColumn(DeptDO.class, "id"); // user // AdminUserDO 是想要使用权限的表 id 是对那个字段生效 比如 这个表 user_id 使用户id 那就使用 user_id