123

ruoyi-cai/src/main/resources/mapper/cai/UserVisitorMapper.xml

@@ -4,28 +4,22 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.ruoyi.cai.mapper.UserVisitorMapper">
 
-    <resultMap type="com.ruoyi.cai.domain.UserVisitor" id="CaiUserVisitorResult">
-        <result property="id" column="id"/>
-        <result property="userId" column="user_id"/>
-        <result property="visitorId" column="visitor_id"/>
-        <result property="isWatch" column="is_watch"/>
-        <result property="createTime" column="create_time"/>
-    </resultMap>
-    <select id="pageApp" resultType="com.ruoyi.cai.dto.app.vo.user.UserStarOrVisitorList">
+    <select id="pageMyFanKe" resultType="com.ruoyi.cai.dto.app.vo.user.UserStarOrVisitorList">
         select
         t1.create_time as happen_time,t1.is_watch,
-        t2.id as user_id,
-        t2.avatar,t2.gender,t2.city_id,t2.city,t2.nickname,t2.usercode,t2.age
+        t2.id as user_id,t2.avatar,t2.gender,t2.city_id,t2.city,t2.nickname,t2.usercode,t2.age
+        from cai_user_visitor t1
+        join cai_user t2 on t1.visitor_id = t2.id
+        where t1.user_id = #{query.userId}
+        order by t1.create_time desc
+    </select>
+    <select id="pageMyZhuJi" resultType="com.ruoyi.cai.dto.app.vo.user.UserStarOrVisitorList">
+        select
+            t1.create_time as happen_time,t1.is_watch,
+            t2.id as user_id,t2.avatar,t2.gender,t2.city_id,t2.city,t2.nickname,t2.usercode,t2.age
         from cai_user_visitor t1
         join cai_user t2 on t1.user_id = t2.id
-        <where>
-            <if test="query.type == 1">
-                and t1.visitor_id = #{query.userId}
-            </if>
-            <if test="query.type == 2">
-                and t1.user_id = #{query.userId}
-            </if>
-        </where>
+        where t1.visitor_id = #{query.userId}
         order by t1.create_time desc
     </select>