From ecf81be077477b956c2cff82c8a9dbbfd1233b9e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=A9=AC=E4=B8=89=E7=82=AE?= <15856818120@163.com>
Date: Thu, 3 Apr 2025 17:09:00 +0800
Subject: [PATCH] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E6=97=B6=E6=96=B0=E5=A2=9E?=
 =?UTF-8?q?=E5=88=9B=E5=BB=BA=E4=BA=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/impl/CoordinatePhotoServiceImpl.java          | 4 ++--
 .../service/impl/ImportantMatterServiceImpl.java          | 8 ++++----
 .../service/impl/SafetyMeasuresServiceImpl.java           | 4 ++--
 3 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/src/main/java/com/bonus/imgTool/imageUpload/service/impl/CoordinatePhotoServiceImpl.java b/src/main/java/com/bonus/imgTool/imageUpload/service/impl/CoordinatePhotoServiceImpl.java
index 8c184ba..e5abdb8 100644
--- a/src/main/java/com/bonus/imgTool/imageUpload/service/impl/CoordinatePhotoServiceImpl.java
+++ b/src/main/java/com/bonus/imgTool/imageUpload/service/impl/CoordinatePhotoServiceImpl.java
@@ -87,7 +87,7 @@ public class CoordinatePhotoServiceImpl implements CoordinatePhotoService {
     public ServerResponse addCoordinatePhoto(CoordinatePhotoVo data) {
         try {
             Long CreateUserId = UserUtil.getLoginUser() != null ? UserUtil.getLoginUser().getId() : 0;
-            String CreateUserName = UserUtil.getLoginUser() != null ? UserUtil.getLoginUser().getNewUser(): null;
+            String CreateUserName = UserUtil.getLoginUser() != null ? UserUtil.getLoginUser().getUsername(): null;
             data.setCreateUserId(CreateUserId);
             data.setCreateUserName(CreateUserName);
             data.setCreateTime(new Date());
@@ -119,7 +119,7 @@ public class CoordinatePhotoServiceImpl implements CoordinatePhotoService {
     public ServerResponse updateCoordinatePhoto(CoordinatePhotoVo data) {
         try {
             Long CreateUserId = UserUtil.getLoginUser() != null ? UserUtil.getLoginUser().getId() : 0;
-            String CreateUserName = UserUtil.getLoginUser() != null ? UserUtil.getLoginUser().getNewUser(): null;
+            String CreateUserName = UserUtil.getLoginUser() != null ? UserUtil.getLoginUser().getUsername(): null;
             data.setUpdateUserId(CreateUserId);
             data.setUpdateUserName(CreateUserName);
             //修改
diff --git a/src/main/java/com/bonus/imgTool/imageUpload/service/impl/ImportantMatterServiceImpl.java b/src/main/java/com/bonus/imgTool/imageUpload/service/impl/ImportantMatterServiceImpl.java
index 23365d0..e7067ae 100644
--- a/src/main/java/com/bonus/imgTool/imageUpload/service/impl/ImportantMatterServiceImpl.java
+++ b/src/main/java/com/bonus/imgTool/imageUpload/service/impl/ImportantMatterServiceImpl.java
@@ -85,7 +85,7 @@ public class ImportantMatterServiceImpl implements ImportantMatterService {
     public ServerResponse addImportantMatter(ImportantMatterVo data) {
         try {
             Long CreateUserId = UserUtil.getLoginUser() != null ? UserUtil.getLoginUser().getId() : 0;
-            String CreateUserName = UserUtil.getLoginUser() != null ? UserUtil.getLoginUser().getNewUser(): null;
+            String CreateUserName = UserUtil.getLoginUser() != null ? UserUtil.getLoginUser().getUsername(): null;
             data.setCreateUserId(CreateUserId);
             data.setCreateUserName(CreateUserName);
             data.setCreateTime(new Date());
@@ -94,7 +94,7 @@ public class ImportantMatterServiceImpl implements ImportantMatterService {
             //保存附件
             List<SysFileResourceVo> sysFileResourceList = data.getSysFileResourceList();
             for (SysFileResourceVo sysFileResourceVo: sysFileResourceList ) {
-                sysFileResourceService.addSysFileResource(sysFileResourceVo,data.getId(),"4",CreateUserId,CreateUserName);
+                sysFileResourceService.addSysFileResource(sysFileResourceVo,data.getId(),"5",CreateUserId,CreateUserName);
             }
             //存入综合查询
             ComprehensiveQueryVo comprehensiveQueryVo = new ComprehensiveQueryVo();
@@ -116,7 +116,7 @@ public class ImportantMatterServiceImpl implements ImportantMatterService {
     public ServerResponse updateImportantMatter(ImportantMatterVo data) {
         try {
             Long CreateUserId = UserUtil.getLoginUser() != null ? UserUtil.getLoginUser().getId() : 0;
-            String CreateUserName = UserUtil.getLoginUser() != null ? UserUtil.getLoginUser().getNewUser(): null;
+            String CreateUserName = UserUtil.getLoginUser() != null ? UserUtil.getLoginUser().getUsername(): null;
             data.setUpdateUserId(CreateUserId);
             data.setUpdateUserName(CreateUserName);
             importantMatterMapper.updateImportantMatter(data);
@@ -126,7 +126,7 @@ public class ImportantMatterServiceImpl implements ImportantMatterService {
             List<SysFileResourceVo> sysFileResourceList = data.getSysFileResourceList();
             for (SysFileResourceVo sysFileResourceVo: sysFileResourceList ) {
 
-                sysFileResourceService.addSysFileResource(sysFileResourceVo,data.getId(),"4",CreateUserId,CreateUserName);
+                sysFileResourceService.addSysFileResource(sysFileResourceVo,data.getId(),"5",CreateUserId,CreateUserName);
             }
             //修改综合查询
             ComprehensiveQueryVo comprehensiveQueryVo = new ComprehensiveQueryVo();
diff --git a/src/main/java/com/bonus/imgTool/imageUpload/service/impl/SafetyMeasuresServiceImpl.java b/src/main/java/com/bonus/imgTool/imageUpload/service/impl/SafetyMeasuresServiceImpl.java
index 9c89c17..e696cb6 100644
--- a/src/main/java/com/bonus/imgTool/imageUpload/service/impl/SafetyMeasuresServiceImpl.java
+++ b/src/main/java/com/bonus/imgTool/imageUpload/service/impl/SafetyMeasuresServiceImpl.java
@@ -86,7 +86,7 @@ public class SafetyMeasuresServiceImpl implements SafetyMeasuresService {
     public ServerResponse addSafetyMeasures(SafetyMeasuresVo data) {
         try {
             Long CreateUserId = UserUtil.getLoginUser() != null ? UserUtil.getLoginUser().getId() : 0;
-            String CreateUserName = UserUtil.getLoginUser() != null ? UserUtil.getLoginUser().getNewUser(): null;
+            String CreateUserName = UserUtil.getLoginUser() != null ? UserUtil.getLoginUser().getUsername(): null;
             data.setCreateUserId(CreateUserId);
             data.setCreateUserName(CreateUserName);
             data.setCreateTime(new Date());
@@ -119,7 +119,7 @@ public class SafetyMeasuresServiceImpl implements SafetyMeasuresService {
     public ServerResponse updateSafetyMeasures(SafetyMeasuresVo data) {
         try {
             Long CreateUserId = UserUtil.getLoginUser() != null ? UserUtil.getLoginUser().getId() : 0;
-            String CreateUserName = UserUtil.getLoginUser() != null ? UserUtil.getLoginUser().getNewUser(): null;
+            String CreateUserName = UserUtil.getLoginUser() != null ? UserUtil.getLoginUser().getUsername(): null;
             data.setUpdateUserId(CreateUserId);
             data.setUpdateUserName(CreateUserName);
             //修改