From 981c0a4eb6961767370ebcd139247f30e2406711 Mon Sep 17 00:00:00 2001
From: xjm <xjm@cloudowr.com>
Date: Wed, 29 May 2024 15:19:22 +0800
Subject: [PATCH] =?UTF-8?q?=E9=80=9A=E8=BF=87=E8=A1=8C=E6=94=BF=E5=8C=BA?=
 =?UTF-8?q?=E5=88=92=E4=B8=8B=E8=BD=BDexcel=E6=96=B0=E5=A2=9E?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/whdc/controller/AddressBookController.java   | 12 ++++++++----
 src/main/java/com/whdc/service/IVersionsService.java |  2 +-
 .../com/whdc/service/impl/VersionsServiceImpl.java   |  5 ++---
 3 files changed, 11 insertions(+), 8 deletions(-)

diff --git a/src/main/java/com/whdc/controller/AddressBookController.java b/src/main/java/com/whdc/controller/AddressBookController.java
index b343908..72bfbd4 100644
--- a/src/main/java/com/whdc/controller/AddressBookController.java
+++ b/src/main/java/com/whdc/controller/AddressBookController.java
@@ -141,7 +141,7 @@ public class AddressBookController {
         }
 
         // 添加日志
-        versionsService.saveInfo(model, VersionsType.ADD);
+        versionsService.saveInfo(model, VersionsType.ADD,model.getAdcd());
         model.setId(null);
 
         boolean save = service.save(model);
@@ -246,7 +246,11 @@ public class AddressBookController {
 //        }
 //        // 添加日志
 //        versionsService.save(new Versions(null, JSON.toJSONString(model),model.getId(),++version,model.getCreateId(),new Date(), VersionsType.UPDATE.getName()));
-        versionsService.saveInfo(model, VersionsType.UPDATE);
+        String adcd = model.getAdcd();
+        if (StringUtils.isBlank(adcd)){
+            adcd = byId.getAdcd();
+        }
+        versionsService.saveInfo(model, VersionsType.UPDATE,adcd);
         boolean data = service.updateById(model);
         if (data) {
             String organization = model.getOrganization();
@@ -337,7 +341,7 @@ public class AddressBookController {
 //        }
 //        // 添加日志
 //        versionsService.save(new Versions(null, JSON.toJSONString(model),model.getId(),++version,model.getCreateId(),new Date(), VersionsType.UPDATE_ROLE.getName()));
-        versionsService.saveInfo(byId, VersionsType.UPDATE_ROLE);
+        versionsService.saveInfo(byId, VersionsType.UPDATE_ROLE,byId.getAdcd());
 
 
         // 只修改角色
@@ -389,7 +393,7 @@ public class AddressBookController {
 //        }
 //        // 添加日志
 //        versionsService.save(new Versions(null, JSON.toJSONString(model),model.getId(),++version,model.getCreateId(),new Date(), VersionsType.DEL.getName()));
-        versionsService.saveInfo(model, VersionsType.DEL);
+        versionsService.saveInfo(model, VersionsType.DEL,model.getAdcd());
 
 
         return ResultJson.ok(service.removeById(id));
diff --git a/src/main/java/com/whdc/service/IVersionsService.java b/src/main/java/com/whdc/service/IVersionsService.java
index 57df741..4ed0585 100644
--- a/src/main/java/com/whdc/service/IVersionsService.java
+++ b/src/main/java/com/whdc/service/IVersionsService.java
@@ -24,5 +24,5 @@ public interface IVersionsService extends IService<Versions> {
     // 获取所有规则
     List<Versions> find(Versions dto);
 
-    boolean saveInfo(AddressBook model, VersionsType versionsType);
+    boolean saveInfo(AddressBook model, VersionsType versionsType, String adcd);
 }
\ No newline at end of file
diff --git a/src/main/java/com/whdc/service/impl/VersionsServiceImpl.java b/src/main/java/com/whdc/service/impl/VersionsServiceImpl.java
index 0255f25..f2c387f 100644
--- a/src/main/java/com/whdc/service/impl/VersionsServiceImpl.java
+++ b/src/main/java/com/whdc/service/impl/VersionsServiceImpl.java
@@ -3,7 +3,6 @@ package com.whdc.service.impl;
 import cn.dev33.satoken.stp.StpUtil;
 import com.alibaba.fastjson.JSON;
 import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.whdc.mapper.VersionsMapper;
 import com.whdc.model.dto.CommDto;
@@ -44,7 +43,7 @@ public class VersionsServiceImpl extends ServiceImpl<VersionsMapper, Versions> i
     }
 
     @Override
-    public boolean saveInfo(AddressBook model, VersionsType versionsType) {
+    public boolean saveInfo(AddressBook model, VersionsType versionsType, String adcd) {
 
         Integer version = 0;
 
@@ -64,7 +63,7 @@ public class VersionsServiceImpl extends ServiceImpl<VersionsMapper, Versions> i
 
         // 添加日志
         Versions entity = new Versions(null,
-                JSON.toJSONString(model), model.getId(), ++version, String.valueOf(StpUtil.getLoginId()), new Date(),versionsType.getName(),
+                JSON.toJSONString(model), model.getId(), ++version, adcd,String.valueOf(StpUtil.getLoginId()), new Date(),versionsType.getName(),
                 null, null
         );