nnnn

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

@@ -15,5 +15,17 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="updateTime" column="update_time"/>
     </resultMap>
 
-
+    <select id="pageAdmin" resultType="com.ruoyi.cai.dto.admin.vo.IpRecordAdminVO">
+        select t1.*,if(t2.id,1,0) as black
+        from cai_ip_record t1
+        left join cai_ip_black t2 on t1.ip_addr = t2.ip_addr and t2.enable_status = 1
+        where 1=1
+        <if test="bo.ipAddr != null and bo.ipAddr != ''">
+            and t1.ip_addr = #{bo.ipAddr}
+        </if>
+        <if test="bo.minNumber != null">
+            and t1.number > #{bo.minNumber}
+        </if>
+        order by t1.count_date desc, ip_addr
+    </select>
 </mapper>

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

@@ -100,7 +100,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         limit 20
     </select>
     <select id="getMinUserById" resultType="com.ruoyi.cai.dto.commom.user.MinUser">
-        select id,gender
+        select id,gender,mobile
         from cai_user t1
         where id = #{userId}
     </select>