09-24-通讯录uer过滤条件新增管理员过滤

xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/bo/SysUserBo.java

@@ -58,6 +58,8 @@ public class SysUserBo extends BaseEntity {
      */
     private String userType;
 
+    private String appUserType;
+
     /**
      * 用户邮箱
      */

xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/websocket/service/Impl/ChatFriendshipServiceImpl.java

@@ -91,6 +91,7 @@ public class ChatFriendshipServiceImpl extends ServiceImpl<ChatFriendshipMapper,
             .like(StringUtils.isNotBlank(user.getNickName()), "u.nick_name", user.getNickName())
             .like(StringUtils.isNotBlank(user.getUserName()), "u.user_name", user.getUserName())
             .eq(StringUtils.isNotBlank(user.getStatus()), "u.status", user.getStatus())
+            .eq("u.app_user_type",'1')
             .like(StringUtils.isNotBlank(user.getPhonenumber()), "u.phonenumber", user.getPhonenumber())
             .between(params.get("beginTime") != null && params.get("endTime") != null, "u.create_time", params.get("beginTime"), params.get("endTime"))
             .eq(ObjectUtil.isNotNull(user.getDeptId()),"u.dept_id", user.getDeptId())