From 11b72504f7ba291247f6c714545d1db1ca187811 Mon Sep 17 00:00:00 2001
From: liuxiaoxu <1793812695@qq.com>
Date: Thu, 18 Apr 2024 10:09:54 +0800
Subject: [PATCH] =?UTF-8?q?[fix]=E5=B7=A5=E7=A8=8B=E7=AE=A1=E7=90=86:=20?=
 =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E4=BA=A7=E5=93=81=E5=9E=8B=E5=8F=B7=E7=AE=A1?=
 =?UTF-8?q?=E7=90=86=E7=9A=84bug=20=E4=BF=AE=E5=A4=8D=20=E4=BF=AE=E6=94=B9?=
 =?UTF-8?q?=E6=95=B0=E6=8D=AE=E7=9A=84=E6=97=B6=E5=80=99=E4=B8=8D=E6=98=BE?=
 =?UTF-8?q?=E7=A4=BA=E4=BF=AE=E6=94=B9=E4=BA=BA=E9=97=AE=E9=A2=98=20?=
 =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=95=B0=E6=8D=AE=E5=BA=93=E5=AD=97=E6=AE=B5?=
 =?UTF-8?q?=E9=94=99=E8=AF=AF=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../system/service/impl/SysProductModelServiceImpl.java     | 1 +
 .../main/resources/mapper/system/SysProductModelMapper.xml  | 6 +++---
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/ruoyi-admin/src/main/java/com/ruoyi/system/service/impl/SysProductModelServiceImpl.java b/ruoyi-admin/src/main/java/com/ruoyi/system/service/impl/SysProductModelServiceImpl.java
index 49285071..c5bdc358 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/system/service/impl/SysProductModelServiceImpl.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/system/service/impl/SysProductModelServiceImpl.java
@@ -108,6 +108,7 @@ public class SysProductModelServiceImpl implements ISysProductModelService
     public int updateSysProductModel(SysProductModel sysProductModel)
     {
         sysProductModel.setUpdateTime(DateUtils.getNowDate());
+        sysProductModel.setUpdateBy(ShiroUtils.getLoginName());
         return sysProductModelMapper.updateSysProductModel(sysProductModel);
     }
 
diff --git a/ruoyi-admin/src/main/resources/mapper/system/SysProductModelMapper.xml b/ruoyi-admin/src/main/resources/mapper/system/SysProductModelMapper.xml
index 2eba77a8..bdde7309 100644
--- a/ruoyi-admin/src/main/resources/mapper/system/SysProductModelMapper.xml
+++ b/ruoyi-admin/src/main/resources/mapper/system/SysProductModelMapper.xml
@@ -23,12 +23,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 
     <sql id="selectSysProductModelVo">
         select pid, pcode, equipModel, equipName,engineer,use_status,
-            specification, differences,  create_by, create_time, udpate_by,
+            specification, differences,  create_by, create_time, update_by,
                update_time,remark, photoUrl from sys_product_model
     </sql>
     <select id="selectSysProductModelList" parameterType="SysProductModel" resultMap="SysProductModelResult">
         select s.pid, s.pcode, s.equipModel, s.equipName,s.engineer,s.use_status,
-        s.specification, s.differences, s. create_by, s.create_time, s.udpate_by,
+        s.specification, s.differences, s. create_by, s.create_time, s.update_by,
         s.update_time,s.remark, s.photoUrl,file.url as photo_url from sys_product_model as s
         left join (
         select
@@ -60,7 +60,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     
     <select id="selectSysProductModelById" parameterType="Long" resultMap="SysProductModelResult">
         select s.pid, s.pcode, s.equipModel, s.equipName,s.engineer,s.use_status,
-        s.specification, s.differences, s. create_by, s.create_time, s.udpate_by,
+        s.specification, s.differences, s. create_by, s.create_time, s.update_by,
         s.update_time,s.remark, s.photoUrl,att.id as photo_attach_id from sys_product_model as s
         left join sys_attach as att
         on s.pid = att.rel_id and att.source_type = 'sysProductModel' and att.source_sub_type = 'photo'