From b970311aab23d9cbb3abf0a8237a46c828d02cc3 Mon Sep 17 00:00:00 2001
From: linhw <5331581+linhw11@user.noreply.gitee.com>
Date: Thu, 6 Jun 2024 10:22:38 +0800
Subject: [PATCH] =?UTF-8?q?bug=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../ruoyi/app/service/impl/AppUserDynamicServiceImpl.java  | 5 +----
 .../com/ruoyi/app/service/impl/AppUserServiceImpl.java     | 6 ++++++
 .../src/main/resources/mapper/app/AppUserMapper.xml        | 7 ++++++-
 3 files changed, 13 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 cb6e400..848d51c 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
@@ -208,10 +208,7 @@ public class AppUserDynamicServiceImpl implements IAppUserDynamicService
             List<Long> userIds = appDynamicLikeMapper.selectAppDynamicLikeList(appDynamicLike).stream().map(x->x.getUserId()).collect(Collectors.toList());
             appUserDynamicVo.setCountLike(userIds.size());
             // 是否点赞
-            if (appUserDynamic.getAppId() != null) {
-                appUserDynamicVo.setIsLike(userIds.contains(appUserDynamic.getUserId()) ? 0 : 1);
-
-            }
+            appUserDynamicVo.setIsLike(userIds.contains(appUserDynamic.getUserId()) ? 0 : 1);
 
             AppUserCollect appUserCollect = new AppUserCollect();
             appUserCollect.setDynamicId(id);
diff --git a/gan-modules/ruoyi-gan/src/main/java/com/ruoyi/app/service/impl/AppUserServiceImpl.java b/gan-modules/ruoyi-gan/src/main/java/com/ruoyi/app/service/impl/AppUserServiceImpl.java
index 519cb24..ae5755c 100644
--- a/gan-modules/ruoyi-gan/src/main/java/com/ruoyi/app/service/impl/AppUserServiceImpl.java
+++ b/gan-modules/ruoyi-gan/src/main/java/com/ruoyi/app/service/impl/AppUserServiceImpl.java
@@ -62,6 +62,9 @@ public class AppUserServiceImpl implements IAppUserService {
     @Autowired
     private AppOrderMapper appOrderMapper;
 
+    @Autowired
+    private AppRegisterMapper appRegisterMapper;
+
     @Override
     public AjaxResult statistics() {
         StatisticsVo statisticsVo = new StatisticsVo();
@@ -210,6 +213,9 @@ public class AppUserServiceImpl implements IAppUserService {
     public int deleteAppUserByIds(Long[] ids) {
         for (Long id : ids) {
             userSkillMapper.deleteUserSkillByUserId(id);
+            AppUser appUser = appUserMapper.selectAppUserById(id);
+            AppRegister appRegister = appRegisterMapper.selectAppRegisterByphone(appUser.getPhone());
+            appRegisterMapper.deleteAppRegisterById(appRegister.getId());
         }
         return appUserMapper.deleteAppUserByIds(ids);
     }
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 6943748..fc41468 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
@@ -92,7 +92,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
        a.order_start_time as "orderStartTime",
        a.order_end_time as "orderEndTime" ,
          a.`check` as "check",
-        a.back_ground_img as "backGroundImg"
+        a.back_ground_img as "backGroundImg",
+       a.hy as "hy",
+       a.jx as "jx",
+       a.jy as "jy",
+       a.is_show_tech as "isShowTech",
+       a.cyfx as "cyfx"
     </sql>
 
     <sql id="selectAppUserVo">