From 03805f3cfd53cbb2f94e4b67bba4728ca22dfc80 Mon Sep 17 00:00:00 2001
From: jiaosong <jiaosong6760@dingtalk.com>
Date: 星期五, 03 十一月 2023 15:36:21 +0800
Subject: [PATCH] # log日志

---
 server/services/src/main/java/com/doumee/service/business/impl/AdServiceImpl.java |   19 +++++++++++++------
 1 files changed, 13 insertions(+), 6 deletions(-)

diff --git a/server/services/src/main/java/com/doumee/service/business/impl/AdServiceImpl.java b/server/services/src/main/java/com/doumee/service/business/impl/AdServiceImpl.java
index 5ed12db..07648d9 100644
--- a/server/services/src/main/java/com/doumee/service/business/impl/AdServiceImpl.java
+++ b/server/services/src/main/java/com/doumee/service/business/impl/AdServiceImpl.java
@@ -17,6 +17,7 @@
 import org.springframework.util.CollectionUtils;
 
 import java.util.List;
+import java.util.Objects;
 
 /**
  * 骞垮憡淇℃伅琛⊿ervice瀹炵幇
@@ -34,6 +35,8 @@
 
     @Override
     public String create(Ad ad) {
+        ad.setIsdeleted(Constants.ZERO);
+        ad.setStatus(Constants.ZERO);
         adMapper.insert(ad);
         return ad.getId();
     }
@@ -64,11 +67,11 @@
                 .eq(Ad::getId,ad.getId())
                 .set(Ad::getEditor,ad.getEditor())
                 .set(Ad::getEditDate,ad.getEditDate())
-                .set(Ad::getName,ad.getName())
-                .set(Ad::getImgurl,ad.getImgurl())
+                .set(Objects.nonNull(ad.getName()),Ad::getName,ad.getName())
+                .set(Objects.nonNull(ad.getImgurl()),Ad::getImgurl,ad.getImgurl())
                 .set(Ad::getSortnum,ad.getSortnum())
-                .set(Ad::getContent,ad.getContent())
-                .set(Ad::getStatus,ad.getStatus());
+                .set(Objects.nonNull(ad.getContent()),Ad::getContent,ad.getContent())
+                .set(Objects.nonNull(ad.getStatus()),Ad::getStatus,ad.getStatus());
         adMapper.update(null,wrapper);
     }
 
@@ -84,7 +87,11 @@
 
     @Override
     public Ad findById(String id) {
-        return adMapper.selectById(id);
+        String path =systemDictDataBiz.queryByCode(Constants.SYSTEM,Constants.FILE_DIR).getCode()+
+                systemDictDataBiz.queryByCode(Constants.SYSTEM, Constants.PROJECTS).getCode();
+        Ad ad = adMapper.selectById(id);
+        ad.setImgfullurl(path+ad.getImgurl());
+        return ad;
     }
 
     @Override
@@ -147,7 +154,7 @@
         }
         queryWrapper.lambda().orderByAsc(Ad::getSortnum);
         String path =systemDictDataBiz.queryByCode(Constants.SYSTEM,Constants.FILE_DIR).getCode()+
-                systemDictDataBiz.queryByCode(Constants.SYSTEM, Constants.AD).getCode();
+                systemDictDataBiz.queryByCode(Constants.SYSTEM, Constants.PROJECTS).getCode();
 
         IPage<Ad> adIPage = adMapper.selectPage(page, queryWrapper);
         if (!CollectionUtils.isEmpty(adIPage.getRecords())){

--
Gitblit v1.9.3