From 1bf1319f165259bcab566e84b28f3163094b6a92 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=BA=AA=E5=AF=92?= <2533659732@qq.com>
Date: Tue, 7 Nov 2023 14:54:45 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B5=8B=E8=AF=95=E9=97=AE=E9=A2=98=E4=BB=A3?=
 =?UTF-8?q?=E7=A0=81=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../nursestationitem/NurseStationItemController.java          | 2 +-
 .../java/com/xinelu/manage/domain/poserInfo/PoserInfo.java    | 1 -
 .../mapper/manage/nursestationitem/NurseStationItemMapper.xml | 4 +---
 .../resources/mapper/manage/poserInfo/PoserInfoMapper.xml     | 4 +---
 4 files changed, 3 insertions(+), 8 deletions(-)

diff --git a/xinelu-nurse-manage/src/main/java/com/xinelu/manage/controller/nursestationitem/NurseStationItemController.java b/xinelu-nurse-manage/src/main/java/com/xinelu/manage/controller/nursestationitem/NurseStationItemController.java
index 0787751..1744a7b 100644
--- a/xinelu-nurse-manage/src/main/java/com/xinelu/manage/controller/nursestationitem/NurseStationItemController.java
+++ b/xinelu-nurse-manage/src/main/java/com/xinelu/manage/controller/nursestationitem/NurseStationItemController.java
@@ -7,6 +7,7 @@ import com.xinelu.common.core.controller.BaseController;
 import com.xinelu.common.core.domain.AjaxResult;
 import com.xinelu.common.core.page.TableDataInfo;
 import com.xinelu.common.custominterface.Insert;
+import com.xinelu.common.custominterface.Update;
 import com.xinelu.common.enums.BusinessType;
 import com.xinelu.common.exception.ServiceException;
 import com.xinelu.common.utils.poi.ExcelUtil;
@@ -15,7 +16,6 @@ import com.xinelu.manage.dto.nursestationitem.NurseStationItemDTO;
 import com.xinelu.manage.dto.nursestationitem.NurseStationItemImportDTO;
 import com.xinelu.manage.service.nursestationitem.INurseStationItemService;
 import com.xinelu.manage.vo.nursestationitem.NurseStationItemVO;
-import net.sf.jsqlparser.statement.update.Update;
 import org.apache.commons.io.FileUtils;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.security.access.prepost.PreAuthorize;
diff --git a/xinelu-nurse-manage/src/main/java/com/xinelu/manage/domain/poserInfo/PoserInfo.java b/xinelu-nurse-manage/src/main/java/com/xinelu/manage/domain/poserInfo/PoserInfo.java
index f5d4332..11e38e6 100644
--- a/xinelu-nurse-manage/src/main/java/com/xinelu/manage/domain/poserInfo/PoserInfo.java
+++ b/xinelu-nurse-manage/src/main/java/com/xinelu/manage/domain/poserInfo/PoserInfo.java
@@ -68,7 +68,6 @@ public class PoserInfo extends BaseDomain implements Serializable {
      */
     @ApiModelProperty(value = "海报简介")
     @Excel(name = "海报简介")
-    @NotBlank(message = "海报简介不能为空", groups = {Insert.class, Update.class})
     private String posterIntroduce;
 
     /**
diff --git a/xinelu-nurse-manage/src/main/resources/mapper/manage/nursestationitem/NurseStationItemMapper.xml b/xinelu-nurse-manage/src/main/resources/mapper/manage/nursestationitem/NurseStationItemMapper.xml
index c22ca2c..e2f5426 100644
--- a/xinelu-nurse-manage/src/main/resources/mapper/manage/nursestationitem/NurseStationItemMapper.xml
+++ b/xinelu-nurse-manage/src/main/resources/mapper/manage/nursestationitem/NurseStationItemMapper.xml
@@ -189,11 +189,9 @@
                nst.appointment_time_interval,
                nst.nurse_classify_name,
                nst.shelf_status,
-               ns.nurse_station_name,
-               nt.nurse_type_name
+               ns.nurse_station_name
         from nurse_station_item nst
                  LEFT JOIN nurse_station ns on ns.id = nst.nurse_station_id
-                 LEFT JOIN nurse_type nt on nt.id = nst.nurse_type_id
         where nst.id = #{id}
     </select>
 
diff --git a/xinelu-nurse-manage/src/main/resources/mapper/manage/poserInfo/PoserInfoMapper.xml b/xinelu-nurse-manage/src/main/resources/mapper/manage/poserInfo/PoserInfoMapper.xml
index 53f0a6f..c69c3cd 100644
--- a/xinelu-nurse-manage/src/main/resources/mapper/manage/poserInfo/PoserInfoMapper.xml
+++ b/xinelu-nurse-manage/src/main/resources/mapper/manage/poserInfo/PoserInfoMapper.xml
@@ -288,9 +288,7 @@
             <if test="poserCode != null">poser_code =
                 #{poserCode},
             </if>
-            <if test="posterIntroduce != null">poster_introduce =
-                #{posterIntroduce},
-            </if>
+            poster_introduce = #{posterIntroduce},
             <if test="posterPictureUrl != null">poster_picture_url =
                 #{posterPictureUrl},
             </if>