From 68023b8cc0edb37ffa3e6b891c84c7df95bc7263 Mon Sep 17 00:00:00 2001
From: YiFei Kuang <clunt@vip.163.com>
Date: Thu, 6 Feb 2025 11:32:07 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E5=95=86=E5=93=81=E7=BC=96=E8=BE=91?=
 =?UTF-8?q?=E9=87=91=E9=A2=9D=E4=B8=8D=E7=94=9F=E6=95=88=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../mapper/goods/DeptGoodsCategoryMapper.xml  |  8 +++----
 .../impl/AfterServiceRecordServiceImpl.java   |  6 +++++-
 .../java/com/ghy/system/domain/SysBanner.java | 21 +++++++++++++++++++
 3 files changed, 30 insertions(+), 5 deletions(-)
 create mode 100644 ghy-system/src/main/java/com/ghy/system/domain/SysBanner.java

diff --git a/ghy-goods/src/main/resources/mapper/goods/DeptGoodsCategoryMapper.xml b/ghy-goods/src/main/resources/mapper/goods/DeptGoodsCategoryMapper.xml
index ad6f31db..954685c6 100644
--- a/ghy-goods/src/main/resources/mapper/goods/DeptGoodsCategoryMapper.xml
+++ b/ghy-goods/src/main/resources/mapper/goods/DeptGoodsCategoryMapper.xml
@@ -89,14 +89,14 @@
             <if test="isSure != null">is_sure = #{isSure},</if>
             <if test="isCert != null">is_cert = #{isCert},</if>
             <if test="deptRate != null and deptRate != ''">dept_rate = #{deptRate},</if>
-            <if test="deptMoney != null and deptMoney != ''">dept_money = #{deptMoney},</if>
+            <if test="deptMoney != null">dept_money = #{deptMoney},</if>
             <if test="retainRate != null and retainRate != ''">retain_rate = #{retainRate},</if>
-            <if test="retainMoney != null and retainMoney != ''">retain_money = #{retainMoney},</if>
+            <if test="retainMoney != null">retain_money = #{retainMoney},</if>
 
             <if test="pcDeptRate != null and pcDeptRate != ''">pc_dept_rate = #{pcDeptRate},</if>
-            <if test="pcDeptMoney != null and pcDeptMoney != ''">pc_dept_money = #{pcDeptMoney},</if>
+            <if test="pcDeptMoney != null">pc_dept_money = #{pcDeptMoney},</if>
             <if test="pcRetainRate != null and pcRetainRate != ''">pc_retain_rate = #{pcRetainRate},</if>
-            <if test="pcRetainMoney != null and pcRetainMoney != ''">pc_retain_money = #{pcRetainMoney},</if>
+            <if test="pcRetainMoney != null">pc_retain_money = #{pcRetainMoney},</if>
 
             <if test="categorySort != null">category_sort = #{categorySort},</if>
             <if test="oneRate != null and oneRate != ''">one_rate = #{oneRate},</if>
diff --git a/ghy-order/src/main/java/com/ghy/order/service/impl/AfterServiceRecordServiceImpl.java b/ghy-order/src/main/java/com/ghy/order/service/impl/AfterServiceRecordServiceImpl.java
index 39d59395..77164e53 100644
--- a/ghy-order/src/main/java/com/ghy/order/service/impl/AfterServiceRecordServiceImpl.java
+++ b/ghy-order/src/main/java/com/ghy/order/service/impl/AfterServiceRecordServiceImpl.java
@@ -78,8 +78,12 @@ public class AfterServiceRecordServiceImpl implements IAfterServiceRecordService
      */
     @Override
     public List<AfterServiceRecord> selectAfterServiceRecordList(AfterServiceRecord afterServiceRecord) {
+        if(afterServiceRecord == null){
+            afterServiceRecord = new AfterServiceRecord();
+            afterServiceRecord.setNeedImgs(false);
+        }
         List<AfterServiceRecord> list = afterServiceRecordMapper.selectAfterServiceRecordList(afterServiceRecord);
-        if(!afterServiceRecord.getNeedImgs()){
+        if(afterServiceRecord.getNeedImgs() != null && !afterServiceRecord.getNeedImgs()){
             return list;
         }
         list.forEach(record -> {
diff --git a/ghy-system/src/main/java/com/ghy/system/domain/SysBanner.java b/ghy-system/src/main/java/com/ghy/system/domain/SysBanner.java
new file mode 100644
index 00000000..07b3f74f
--- /dev/null
+++ b/ghy-system/src/main/java/com/ghy/system/domain/SysBanner.java
@@ -0,0 +1,21 @@
+package com.ghy.system.domain;
+
+import com.ghy.common.core.domain.BaseEntity;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+/**
+ * <p>轮播图管理</p>
+ * @author clunt
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+public class SysBanner extends BaseEntity {
+
+    private Long id;
+
+    private String bannerUrl;
+
+    private String bannerTitle;
+
+}