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

zhongrj

2023-10-19 aa6fd3986a72524dea1547f2b1cce85ea71228bd

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

@@ -42,7 +42,10 @@
    * @param tenantId
    * @return
    */
   List<User> selectUserPage(IPage<User> page, @Param("user") User user, @Param("deptIdList") List<Long> deptIdList, @Param("tenantId") String tenantId);
   List<UserVO> selectUserPage(IPage<UserVO> page, @Param("user") UserVO user, @Param("deptIdList") List<Long> deptIdList, @Param("tenantId") String tenantId);

   List<UserVO> getAllUser(@Param("user")UserVO user,@Param("deptIdList") List<Long> deptIdList, @Param("tenantId")  String tenantId);


   /**
    * 获取用户
@@ -70,4 +73,7 @@
    * @return
    */
    List<User> selectUserByPhoneOrAccount(@Param("tenantId")String tenantId, @Param("key")String key);

    List<User> getUserByPhoneIds(@Param("phoneIds") String phoneIds);

}