图片上传

ruoyi-system/src/main/resources/mapper/bgt/BgtProjectRecruitApplyMapper.xml

@@ -268,21 +268,21 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 
     <select id="userAllRecruitment" resultType="com.ruoyi.wgz.bo.rests.WgzAppUserAllRecruitmentTwo">
         SELECT
+            a.id as recruitApplyId,
             b.id as recruitId,
-            b.recruit_name
+            CONCAT_WS('|', b.recruit_name, a.entry_time) as recruitName
         FROM
             bgt_project_recruit_apply as a
                 LEFT JOIN bgt_project_recruit as b on(b.id = a.recruit_id)
         WHERE
             a.user_id = #{userId}
-          <if test="type!=null and type!='1'">
-              and a.status in ("3","5","6")
-          </if>
-        <if test="type!=null and type!='2'">
-            and a.status in ("1","3","5","6")
-        </if>
+            <if test="type!=null and type!=1">
+                and a.status in ("3","5","6")
+            </if>
+            <if test="type!=null and type!=2">
+                and a.status in ("1","3","5","6")
+            </if>
           and a.del_flag = "0"
-        GROUP BY a.recruit_id
     </select>
 
 </mapper>