From 4e81ecad34d1c6179c5b8eaa5d63f3cbc2cc93fa Mon Sep 17 00:00:00 2001
From: linhw <5331581+linhw11@user.noreply.gitee.com>
Date: Fri, 24 May 2024 16:06:47 +0800
Subject: [PATCH] =?UTF-8?q?=E7=94=A8=E6=88=B7=E6=A0=87=E7=AD=BE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/com/ruoyi/app/domain/AppUser.java    |  6 +++---
 .../com/ruoyi/app/domain/vo/AppUserVo.java    |  7 ++++---
 .../app/service/impl/AppUserServiceImpl.java  | 21 ++++++++++++-------
 3 files changed, 20 insertions(+), 14 deletions(-)

diff --git a/gan-modules/ruoyi-gan/src/main/java/com/ruoyi/app/domain/AppUser.java b/gan-modules/ruoyi-gan/src/main/java/com/ruoyi/app/domain/AppUser.java
index ebc87e1..f833fe6 100644
--- a/gan-modules/ruoyi-gan/src/main/java/com/ruoyi/app/domain/AppUser.java
+++ b/gan-modules/ruoyi-gan/src/main/java/com/ruoyi/app/domain/AppUser.java
@@ -108,7 +108,7 @@ public class AppUser extends BaseEntity
 
     /** 技能id */
     @Excel(name = "技能id")
-    private Long skillId;
+    private String skillId;
 
     /** 工作内容 */
     @Excel(name = "工作内容")
@@ -359,12 +359,12 @@ public class AppUser extends BaseEntity
     {
         return jobType;
     }
-    public void setSkillId(Long skillId)
+    public void setSkillId(String skillId)
     {
         this.skillId = skillId;
     }
 
-    public Long getSkillId()
+    public String getSkillId()
     {
         return skillId;
     }
diff --git a/gan-modules/ruoyi-gan/src/main/java/com/ruoyi/app/domain/vo/AppUserVo.java b/gan-modules/ruoyi-gan/src/main/java/com/ruoyi/app/domain/vo/AppUserVo.java
index d3348b8..c094918 100644
--- a/gan-modules/ruoyi-gan/src/main/java/com/ruoyi/app/domain/vo/AppUserVo.java
+++ b/gan-modules/ruoyi-gan/src/main/java/com/ruoyi/app/domain/vo/AppUserVo.java
@@ -1,6 +1,7 @@
 package com.ruoyi.app.domain.vo;
 
 import com.fasterxml.jackson.annotation.JsonFormat;
+import com.ruoyi.app.domain.AppSkill;
 import com.ruoyi.app.domain.AppUser;
 import com.ruoyi.app.domain.UserSkill;
 import com.ruoyi.common.core.annotation.Excel;
@@ -26,7 +27,7 @@ public class AppUserVo extends AppUser
     @Excel(name = "学校名称")
     private String schoolName;
 
-    private List<UserSkill> userSkillList;
+    private List<AppSkill> userSkillList;
 
     private String cityName;
 
@@ -37,11 +38,11 @@ public class AppUserVo extends AppUser
     private Integer attentionNum;
 
     private int fansNum;
-    public void setUserSkillList(List<UserSkill> userSkillList) {
+    public void setUserSkillList(List<AppSkill> userSkillList) {
         this.userSkillList = userSkillList;
     }
 
-    public List<UserSkill> getUserSkillList() {
+    public List<AppSkill> getUserSkillList() {
         return userSkillList;
     }
 
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 5994474..534c57f 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
@@ -41,6 +41,9 @@ public class AppUserServiceImpl implements IAppUserService
     @Autowired
     private AppUserFansMapper appUserFansMapper;
 
+    @Autowired
+    private AppSkillMapper appSkillMapper;
+
     /**
      * 查询app用户
      * 
@@ -49,14 +52,16 @@ public class AppUserServiceImpl implements IAppUserService
      */
     @Override
     public AppUserVo selectAppUserById(Long id) {
-        UserSkill userSkill = new UserSkill();
-        userSkill.setUserId(id);
-        List<UserSkill> userSkillList = userSkillMapper.selectUserSkillList(userSkill);
         AppUserVo appUser = appUserMapper.selectAppUserById(id);
-        if(CollectionUtils.isNotEmpty(userSkillList)) {
-            appUser.setUserSkillList(userSkillList);
+        List<AppSkill> appSkills = new ArrayList<>();
+        if (appUser.getSkillId() != null) {
+            List<String> skillIds = Arrays.asList(appUser.getSkillId().split(","));
+            for (String skillId : skillIds) {
+                AppSkill appSkill = appSkillMapper.selectAppSkillById(Long.valueOf(skillId));
+                appSkills.add(appSkill);
+            }
         }
-
+        appUser.setUserSkillList(appSkills);
         return appUser;
     }
 
@@ -111,7 +116,7 @@ public class AppUserServiceImpl implements IAppUserService
     public int updateAppUser(AppUser appUser)
     {
         appUser.setUpdateTime(DateUtils.getNowDate());
-        if (StringUtils.isNotBlank(appUser.getSkills())) {
+        /*if (StringUtils.isNotBlank(appUser.getSkills())) {
             // 删除标签
             userSkillMapper.deleteUserSkillByUserId(appUser.getId());
             // 保存技能标签
@@ -122,7 +127,7 @@ public class AppUserServiceImpl implements IAppUserService
                 userSkill.setUserId(appUser.getId());
                 userSkillMapper.insertUserSkill(userSkill);
             }
-        }
+        }*/
         return appUserMapper.updateAppUser(appUser);
     }