Merge remote-tracking branch 'origin/jtdev' into jtdev

xieb

2023-10-19 1dd5d8f8a616f5cf3caa7828d46989c7d3dcafc4

 skjcmanager/skjcmanager-service/skjcmanager-user/src/main/java/cn/gistack/system/user/service/IUserService.java

@@ -70,7 +70,10 @@
    * @param tenantId
    * @return
    */
   IPage<User> selectUserPage(IPage<User> page, User user, Long deptId, String tenantId);
   IPage<UserVO> selectUserPage(IPage<UserVO> page, UserVO user, Long deptId, String tenantId);

   List<UserVO> getAllUser(UserVO user, Long deptId, String tenantId);


   /**
    * 自定义分页
@@ -215,4 +218,15 @@
    * @return
    */
   List<User> userInfoByPhone(String tenantId, String phone);

   /**
    * 根据手机号码或者账户查询用户信息
    * @param tenantId 租户id
    * @param key 账户或者手机号
    * @return
    */
   List<User> userInfoByPhoneOrAccount(String tenantId, String key);

    List<User> getUserByPhoneIds(String phoneIds);

}