From a458ef90489812338dc995c1baff3234da23d14c Mon Sep 17 00:00:00 2001
From: linhw <5331581+linhw11@user.noreply.gitee.com>
Date: Thu, 6 Jun 2024 13:41:20 +0800
Subject: [PATCH] ~C

---
 .../ruoyi/app/service/impl/AppUserDynamicServiceImpl.java    | 5 ++---
 .../src/main/resources/mapper/app/AppUserDynamicMapper.xml   | 3 +++
 .../src/main/resources/mapper/app/AppUserMapper.xml          | 4 ++--
 3 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/gan-modules/ruoyi-gan/src/main/java/com/ruoyi/app/service/impl/AppUserDynamicServiceImpl.java b/gan-modules/ruoyi-gan/src/main/java/com/ruoyi/app/service/impl/AppUserDynamicServiceImpl.java
index 45e2b88..ffbba8a 100644
--- a/gan-modules/ruoyi-gan/src/main/java/com/ruoyi/app/service/impl/AppUserDynamicServiceImpl.java
+++ b/gan-modules/ruoyi-gan/src/main/java/com/ruoyi/app/service/impl/AppUserDynamicServiceImpl.java
@@ -112,11 +112,10 @@ public class AppUserDynamicServiceImpl implements IAppUserDynamicService
      * @return 结果
      */
     @Override
-    public int updateAppUserDynamic(AppUserDynamic appUserDynamic)
-    {
+    public int updateAppUserDynamic(AppUserDynamic appUserDynamic) {
         appUserDynamic.setUpdateTime(DateUtils.getNowDate());
+        appDynamicImgMapper.deleteAppDynamicImgByDynamicId(appUserDynamic.getId());
         if (StringUtils.isNotBlank(appUserDynamic.getImgUrls())) {
-            appDynamicImgMapper.deleteAppDynamicImgByDynamicId(appUserDynamic.getId());
             List<String> imgs = Arrays.asList(appUserDynamic.getImgUrls().split(","));
             for (String img : imgs) {
                 AppDynamicImg appDynamicImg = new AppDynamicImg();
diff --git a/gan-modules/ruoyi-gan/src/main/resources/mapper/app/AppUserDynamicMapper.xml b/gan-modules/ruoyi-gan/src/main/resources/mapper/app/AppUserDynamicMapper.xml
index 325abfb..ca11d3c 100644
--- a/gan-modules/ruoyi-gan/src/main/resources/mapper/app/AppUserDynamicMapper.xml
+++ b/gan-modules/ruoyi-gan/src/main/resources/mapper/app/AppUserDynamicMapper.xml
@@ -197,6 +197,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="createBy != null">create_by = #{createBy},</if>
             <if test="updateBy != null">updateBy = #{updateBy},</if>
             <if test="isTop != null">is_top = #{isTop},</if>
+            <if test="cityId != null">city_id = #{cityId},</if>
+            <if test="provinceId != null">province_id = #{provinceId},</if>
+            <if test="townId != null">town_id = #{townId},</if>
         </trim>
         where id = #{id}
     </update>
diff --git a/gan-modules/ruoyi-gan/src/main/resources/mapper/app/AppUserMapper.xml b/gan-modules/ruoyi-gan/src/main/resources/mapper/app/AppUserMapper.xml
index fc41468..a2ade57 100644
--- a/gan-modules/ruoyi-gan/src/main/resources/mapper/app/AppUserMapper.xml
+++ b/gan-modules/ruoyi-gan/src/main/resources/mapper/app/AppUserMapper.xml
@@ -86,6 +86,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
        a.idea as "idea",
        a.is_partner as "isPartner",
        a.hobby as "hobby",
+       a.city as "city",
        a.other as "other",
        a.is_member as "isMember",
        a.order_id as "orderId",
@@ -101,8 +102,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </sql>
 
     <sql id="selectAppUserVo">
-        select id, username, password, nickname, email,sex, phone, address, create_time, update_time, avatar_url, education, school, major, start_time, end_time, experience, company_name, industry, job_time, job_name, job_type, skill_id, job_content, type,is_member,job_end_time,
-               order_id, order_start_time, order_end_time , `check` , back_ground_img,city_id , province_id , town_id,hy, jx, jy, is_show_tech, cyfx from app_user
+        select id, username, password, nickname, email, phone, address, create_time, update_time, avatar_url, education, school, major, start_time, end_time, experience, company_name, industry, job_time, job_name, job_type, skill_id, job_content, type, sex, birthday, share_resource, is_tech, idea, is_partner, hobby, city, other, is_member, order_id, order_start_time, order_end_time, job_end_time, push_id, check, back_ground_img, province_id, city_id, town_id, hy, jx, jy, is_show_tech, cyfx from app_user
     </sql>
 
     <select id="selectAppUserList" parameterType="AppUser" resultMap="AppUserResult">