Merge remote-tracking branch 'origin/master'

fs-service/src/main/java/com/fs/qw/mapper/QwUserMapper.java

@@ -152,6 +152,7 @@ public interface QwUserMapper extends BaseMapper<QwUser>
             "left join fastgpt_role fr on fr.role_id=qu.fastGpt_role_id " +
             "where qu.company_user_id is not null "+
             "            <if test=\"qwUserId != null  and qwUserId != ''\"> and qu.qw_user_id = #{qwUserId}</if>\n" +
+            "            <if test=\"loginStatus != null  and loginStatus != ''\"> and qu.ipad_status = #{loginStatus}</if>\n" +
             "            <if test=\"appKey != null  and appKey != ''\"> and qu.app_key = #{appKey}</if>\n" +
             "            <if test=\"nickName != null  and nickName != ''\"> and cu.nick_name like concat( #{nickName}, '%') </if>\n" +
             "            <if test=\"qwUserName != null  and qwUserName != ''\"> and qu.qw_user_name like concat('%', #{qwUserName}, '%') </if> " +

fs-service/src/main/java/com/fs/qw/mapper/QwWatchLogMapper.java

@@ -102,6 +102,12 @@ public interface QwWatchLogMapper extends BaseMapper<QwWatchLog>{
             "<if test ='(deptIds ==null or deptIds.size = 0) and deptId !=null and deptId!=\"\"'>\n" +
             "   and cu.dept_id = #{deptId}\n" +
             "</if>" +
+            "<if test ='companyId !=null and companyId!=\"\"'>\n" +
+            "   and qu.company_id =#{companyId} \n" +
+            "</if>" +
+            "<if test ='companyUserId !=null and companyUserId!=\"\"'>\n" +
+            "   and qu.company_user_id =#{companyUserId} \n" +
+            "</if>" +
             "<if test ='ids !=null and ids!=\"\"'>\n" +
             "   and qec.qw_user_id in (${ids})\n" +
             "</if>" +

fs-service/src/main/java/com/fs/qw/param/QwUserListParam.java

@@ -37,6 +37,11 @@ public class QwUserListParam {
     @Excel(name = "企微")
     private Integer status;
 
+    /**
+    * 登录状态
+    */
+    private Integer loginStatus;
+
     @Excel(name = "员工状态")
     private Integer isDel;