From b729ab8014e48fe0c05a403b1f62301715ea9de8 Mon Sep 17 00:00:00 2001
From: yedejiamingshi <540057894@qq.com>
Date: Thu, 2 Jan 2025 15:58:15 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9F=A5=E8=AF=A2bug=E4=BF=AE=E5=A4=8D?=
 =?UTF-8?q?=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../vo/UniTemplateUpdateCustomizeReqVO.java            | 10 +++-------
 .../classes/mapper/unitemplate/UniTemplateMapper.xml   |  6 +++---
 2 files changed, 6 insertions(+), 10 deletions(-)

diff --git a/yudao-module-configure/yudao-module-configure-biz/src/main/java/cn/iocoder/yudao/module/configure/controller/admin/unitemplate/vo/UniTemplateUpdateCustomizeReqVO.java b/yudao-module-configure/yudao-module-configure-biz/src/main/java/cn/iocoder/yudao/module/configure/controller/admin/unitemplate/vo/UniTemplateUpdateCustomizeReqVO.java
index c574bcd..f57bf2c 100644
--- a/yudao-module-configure/yudao-module-configure-biz/src/main/java/cn/iocoder/yudao/module/configure/controller/admin/unitemplate/vo/UniTemplateUpdateCustomizeReqVO.java
+++ b/yudao-module-configure/yudao-module-configure-biz/src/main/java/cn/iocoder/yudao/module/configure/controller/admin/unitemplate/vo/UniTemplateUpdateCustomizeReqVO.java
@@ -9,7 +9,6 @@ import lombok.ToString;
 import org.hibernate.validator.constraints.Length;
 
 import javax.validation.Valid;
-import javax.validation.constraints.NotBlank;
 import javax.validation.constraints.NotNull;
 import java.util.List;
 
@@ -23,8 +22,7 @@ public class UniTemplateUpdateCustomizeReqVO extends UniTemplateUpdateReqVO {
     @NotNull(message = "是否显示商品详情不能为空")
     private Boolean showGoodsDetail;
 
-    @ApiModelProperty(value = "商品详情图标", required = true)
-    @NotBlank(message = "商品详情图标不能为空")
+    @ApiModelProperty(value = "商品详情图标")
     @Length(max = 256)
     private String goodsDetailIconUrl;
 
@@ -32,8 +30,7 @@ public class UniTemplateUpdateCustomizeReqVO extends UniTemplateUpdateReqVO {
     @NotNull(message = "是否显示ai不能为空")
     private Boolean showAi;
 
-    @ApiModelProperty(value = "ai图标", required = true)
-    @NotBlank(message = "ai图标不能为空")
+    @ApiModelProperty(value = "ai图标")
     @Length(max = 256)
     private String aiIconUrl;
 
@@ -41,8 +38,7 @@ public class UniTemplateUpdateCustomizeReqVO extends UniTemplateUpdateReqVO {
     @NotNull(message = "是否显示商城不能为空")
     private Boolean showShop;
 
-    @ApiModelProperty(value = "商城图标", required = true)
-    @NotBlank(message = "商城图标不能为空")
+    @ApiModelProperty(value = "商城图标")
     @Length(max = 256)
     private String shopIconUrl;
 
diff --git a/yudao-module-configure/yudao-module-configure-biz/target/classes/mapper/unitemplate/UniTemplateMapper.xml b/yudao-module-configure/yudao-module-configure-biz/target/classes/mapper/unitemplate/UniTemplateMapper.xml
index b344f4f..c3a4b2f 100644
--- a/yudao-module-configure/yudao-module-configure-biz/target/classes/mapper/unitemplate/UniTemplateMapper.xml
+++ b/yudao-module-configure/yudao-module-configure-biz/target/classes/mapper/unitemplate/UniTemplateMapper.xml
@@ -13,15 +13,15 @@
         <collection property="templateItemList" column="template_id=template_id" select="getItemList"></collection>
     </resultMap>
     <select id="getUniTemplateDetail" resultMap="uniTemplateDetailMap">
-        select * from configure_uni_template where id = #{id}
+        select * from configure_uni_template where id = #{id} and deleted = 0
     </select>
 
     <select id="getItemList" resultType="cn.iocoder.yudao.module.configure.controller.admin.unitemplateitem.vo.UniTemplateItemRespVO">
-        select * from configure_uni_template_item where template_id = #{template_id}
+        select * from configure_uni_template_item where template_id = #{template_id} and deleted = 0
     </select>
 
     <select id="selectUniTemplatePage" resultMap="uniTemplateDetailMap">
-        select * from configure_uni_template order by id desc
+        select * from configure_uni_template where deleted = 0 order by id desc
     </select>
 
 </mapper>