~

gan-modules/ruoyi-gan/src/main/java/com/ruoyi/app/domain/AppUser.java

@@ -216,6 +216,18 @@ public class AppUser extends BaseEntity
     @Excel(name = "创业方向")
     private String cyfx;
 
+    /** 是否添加合伙人0是1否 */
+    @Excel(name = "是否添加合伙人0是1否")
+    private Long isAddAdmin;
+
+    /** 合伙人 */
+    @Excel(name = "合伙人")
+    private String adminText;
+
+    @Excel(name = "技术人员")
+    private String techText;
+
+
 
     public void setId(Long id) 
     {

gan-modules/ruoyi-gan/src/main/java/com/ruoyi/app/domain/AppUserFans.java

@@ -35,9 +35,13 @@ public class AppUserFans extends BaseEntity
     private String username;
     private String nickname;
     private Integer check;
-
     private String avatarUrl;
 
+    private String fUsername;
+    private String fNickname;
+    private Integer fCheck;
+    private String fAvatarUrl;
+
     public void setId(Long id) 
     {
         this.id = id;

gan-modules/ruoyi-gan/src/main/java/com/ruoyi/app/service/impl/AppUserFansServiceImpl.java

@@ -55,6 +55,11 @@ public class AppUserFansServiceImpl implements IAppUserFansService
             userFans.setAvatarUrl(appUser.getAvatarUrl());
             userFans.setNickname(appUser.getNickname());
             userFans.setCheck(appUser.getCheck());
+            appUser = appUserMapper.selectAppUserById(userFans.getFriendId());
+            userFans.setFUsername(appUser.getUsername());
+            userFans.setFAvatarUrl(appUser.getAvatarUrl());
+            userFans.setFNickname(appUser.getNickname());
+            userFans.setFCheck(appUser.getCheck());
         }
         return list;
     }

gan-modules/ruoyi-gan/src/main/resources/mapper/app/AppUserMapper.xml

@@ -53,6 +53,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="jy"    column="jy"    />
         <result property="isShowTech"    column="is_show_tech"    />
         <result property="cyfx"    column="cyfx"    />
+        <result property="isAddAdmin"    column="is_add_admin"    />
+        <result property="adminText"    column="admin_text"    />
+        <result property="techText"    column="tech_text"    />
+
     </resultMap>
     <sql id="appUserColumns">
        a.id as "id",
@@ -98,11 +102,14 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
        a.jx as "jx",
        a.jy as "jy",
        a.is_show_tech as "isShowTech",
-       a.cyfx as "cyfx"
+       a.cyfx as "cyfx",
+           a.is_add_admin as "isAddAdmin",
+           a.admin_text as "adminText",
+           a.tech_text as "techText"
     </sql>
 
     <sql id="selectAppUserVo">
-        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
+        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,is_add_admin, admin_text,tech_text from app_user
     </sql>
 
     <select id="selectAppUserList" parameterType="AppUser" resultMap="AppUserResult">
@@ -150,6 +157,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="jy != null  and jy != ''"> and jy = #{jy}</if>
             <if test="isShowTech != null "> and is_show_tech = #{isShowTech}</if>
             <if test="cyfx != null  and cyfx != ''"> and cyfx = #{cyfx}</if>
+            <if test="isAddAdmin != null "> and is_add_admin = #{isAddAdmin}</if>
+            <if test="adminText != null  and adminText != ''"> and admin_text = #{adminText}</if>
+            <if test="techText != null  and techText != ''"> and tech_text = #{techText}</if>
         </where>
     </select>
     
@@ -290,7 +300,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="jy != null">jy,</if>
             <if test="isShowTech != null">is_show_tech,</if>
             <if test="cyfx != null">cyfx,</if>
-         </trim>
+            <if test="isAddAdmin != null">is_add_admin,</if>
+            <if test="adminText != null">admin_text,</if>
+            <if test="techText != null">tech_text,</if>
+        </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
             <if test="username != null">#{username},</if>
             <if test="password != null">#{password},</if>
@@ -339,7 +352,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="jy != null">#{jy},</if>
             <if test="isShowTech != null">#{isShowTech},</if>
             <if test="cyfx != null">#{cyfx},</if>
-         </trim>
+            <if test="isAddAdmin != null">#{isAddAdmin},</if>
+            <if test="adminText != null">#{adminText},</if>
+            <if test="techText != null">#{techText},</if>
+        </trim>
     </insert>
 
     <update id="updateAppUser" parameterType="AppUser">
@@ -389,6 +405,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="jy != null">jy = #{jy},</if>
             <if test="isShowTech != null">is_show_tech = #{isShowTech},</if>
             <if test="cyfx != null">cyfx = #{cyfx},</if>
+            <if test="isAddAdmin != null">is_add_admin = #{isAddAdmin},</if>
+            <if test="adminText != null">admin_text = #{adminText},</if>
+            <if test="techText != null">tech_text = #{techText},</if>
         </trim>
         where id = #{id}
     </update>