From bc91619c854cc2dbb01b20d0c47d76c4881e9ee8 Mon Sep 17 00:00:00 2001
From: mitao <2763622819@qq.com>
Date: 星期二, 20 五月 2025 23:52:21 +0800
Subject: [PATCH] Merge remote-tracking branch '喜望/dev-2.0.1' into dev-2.0.1
---
springcloud_k8s_panzhihuazhihuishequ/service_sangeshenbian/src/main/java/com/panzhihua/sangeshenbian/api/WorkOrderItemConfigController.java | 7 +++++--
1 files changed, 5 insertions(+), 2 deletions(-)
diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_sangeshenbian/src/main/java/com/panzhihua/sangeshenbian/api/WorkOrderItemConfigController.java b/springcloud_k8s_panzhihuazhihuishequ/service_sangeshenbian/src/main/java/com/panzhihua/sangeshenbian/api/WorkOrderItemConfigController.java
index 83d1223..15ff20d 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/service_sangeshenbian/src/main/java/com/panzhihua/sangeshenbian/api/WorkOrderItemConfigController.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_sangeshenbian/src/main/java/com/panzhihua/sangeshenbian/api/WorkOrderItemConfigController.java
@@ -2,6 +2,7 @@
import com.panzhihua.common.interfaces.OperLog;
import com.panzhihua.common.model.vos.R;
+import com.panzhihua.sangeshenbian.annotation.SysLog;
import com.panzhihua.sangeshenbian.model.entity.WorkOrderItemConfig;
import com.panzhihua.sangeshenbian.service.IWorkOrderItemConfigService;
import io.swagger.annotations.Api;
@@ -34,9 +35,11 @@
@PostMapping("/addWorkOrderItemConfig")
@ApiOperation(value = "保存工单事项配置", tags = {"三个身边后台-工单事项配置"})
- @OperLog(operModul = "三个身边后台",operType = 1,businessType = "保存工单事项配置")
+ @SysLog(operatorCategory = "工单事项配置",operId = 5)
public R<WorkOrderItemConfig> add(@RequestBody WorkOrderItemConfig workOrderItemConfig){
+ // 获取原来的数据 用作日志修改对比
+ WorkOrderItemConfig workOrderItemConfig1 = workOrderItemConfigService.getById(workOrderItemConfig.getId() == null ? 0 : workOrderItemConfig.getId());
workOrderItemConfigService.saveOrUpdate(workOrderItemConfig);
- return R.ok();
+ return R.ok(workOrderItemConfig1);
}
}
--
Gitblit v1.7.1