From 975499e428bd46ba7fff03080a05e9b96adf1915 Mon Sep 17 00:00:00 2001 From: likewei <2211508111@qq.com> Date: Mon, 19 Aug 2024 16:03:05 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=AE=A1=E6=A0=B8?= =?UTF-8?q?=E8=A7=84=E5=88=99=E6=9D=83=E9=99=90=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../inspection/work/controller/WrkAuditRuleController.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/chushang-modules/chushang-module-inspection/inspection-service/src/main/java/com/chushang/inspection/work/controller/WrkAuditRuleController.java b/chushang-modules/chushang-module-inspection/inspection-service/src/main/java/com/chushang/inspection/work/controller/WrkAuditRuleController.java index fe6cf0d..d257848 100644 --- a/chushang-modules/chushang-module-inspection/inspection-service/src/main/java/com/chushang/inspection/work/controller/WrkAuditRuleController.java +++ b/chushang-modules/chushang-module-inspection/inspection-service/src/main/java/com/chushang/inspection/work/controller/WrkAuditRuleController.java @@ -43,7 +43,7 @@ public class WrkAuditRuleController { * 新增和修改 */ @PostMapping ("/saveOrUpdate") - @RequiresPermissions("wrk:aduit:su") + @RequiresPermissions("wrk:aduit:save") @SysLog(value = "审核规则新增和修改", businessType = BusinessType.AUDIT) public AjaxResult saveOrUpdate(@Validated @RequestBody WrkAuditRuleDTO dto) { return AjaxResult.success(wrkAuditRuleService.saveOrUpdate(dto)); From 638fcafd0a06a3e23e6bc65185c37b56e61edd98 Mon Sep 17 00:00:00 2001 From: renzexin Date: Mon, 19 Aug 2024 16:13:23 +0800 Subject: [PATCH 2/2] =?UTF-8?q?fix=20=E9=A1=B9=E7=9B=AE=E5=88=97=E8=A1=A8-?= =?UTF-8?q?=E7=8A=B6=E6=80=81=E6=9F=A5=E8=AF=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/chushang/inspection/project/po/WrkProject.java | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/chushang-modules/chushang-module-inspection/inspection-feign/src/main/java/com/chushang/inspection/project/po/WrkProject.java b/chushang-modules/chushang-module-inspection/inspection-feign/src/main/java/com/chushang/inspection/project/po/WrkProject.java index 4b0b476..45f0a86 100644 --- a/chushang-modules/chushang-module-inspection/inspection-feign/src/main/java/com/chushang/inspection/project/po/WrkProject.java +++ b/chushang-modules/chushang-module-inspection/inspection-feign/src/main/java/com/chushang/inspection/project/po/WrkProject.java @@ -95,6 +95,10 @@ public class WrkProject extends BaseEntity { @DictFormat(dictType = "project_effect") @Condition(name = "project_effect", type = Condition.ConditionType.eq) private Integer projectEffect; + @TableField(value = "project_effect") + @DictFormat(dictType = "project_effect") + @Condition(name = "project_effect", type = Condition.ConditionType.eq) + private Integer status; /** * 查询条件 所属部门id