From 9f122a41255d18f04a82d8be3b038a95c2c18d95 Mon Sep 17 00:00:00 2001
From: songhuangfeng123 <shf18767906695@163.com>
Date: 星期二, 20 九月 2022 16:26:08 +0800
Subject: [PATCH] Merge branches 'genchuang' and 'master' of https://sinanoaq.cn:8888/r/safePlatform-out into master
---
goal-manage/goal-manage-service/src/main/java/com/gkhy/safePlatform/targetDuty/controller/ExamineMngController.java | 8 ++++----
1 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/goal-manage/goal-manage-service/src/main/java/com/gkhy/safePlatform/targetDuty/controller/ExamineMngController.java b/goal-manage/goal-manage-service/src/main/java/com/gkhy/safePlatform/targetDuty/controller/ExamineMngController.java
index 17e5f19..83a5405 100644
--- a/goal-manage/goal-manage-service/src/main/java/com/gkhy/safePlatform/targetDuty/controller/ExamineMngController.java
+++ b/goal-manage/goal-manage-service/src/main/java/com/gkhy/safePlatform/targetDuty/controller/ExamineMngController.java
@@ -53,7 +53,7 @@
return this.examineMngService.queryAll(pageQuery);
}
-
+
/**
* 通过主键查询单条数据
@@ -76,9 +76,9 @@
@PostMapping(value = "/addOrUpdate")
public ResultVO update(Authentication authentication, @RequestBody ExamineMng examineMng) {
// 获取当前用户
- ContextCacheUser currentUser = (ContextCacheUser) authentication.getPrincipal();
+/* ContextCacheUser currentUser = (ContextCacheUser) authentication.getPrincipal();
examineMng.setExamineDepartmentId(currentUser.getDepId());
- examineMng.setExaminePersonId(currentUser.getUid());
+ examineMng.setExaminePersonId(currentUser.getUid());*/
if (examineMng.getId() == null) {
return new ResultVO<>(ResultCodes.OK,examineMngBaseService.save(examineMng));
} else {
@@ -117,4 +117,4 @@
System.out.println(JSONObject.toJSONString(examineTemplateSaveOrUpdate));
}
-}
\ No newline at end of file
+}
--
Gitblit v1.9.2