|
|
@@ -1,6 +1,6 @@
|
|
1
|
1
|
package api.controller.system;
|
|
2
|
2
|
|
|
3
|
|
-import api.entity.database.system.UserExtension;
|
|
|
3
|
+import api.entity.database.system.*;
|
|
4
|
4
|
import api.entity.view.call.CallLogView;
|
|
5
|
5
|
import api.entity.view.system.UserView;
|
|
6
|
6
|
import api.service.system.IUserExtensionService;
|
|
|
@@ -11,9 +11,6 @@ import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
|
|
11
|
11
|
import com.baomidou.mybatisplus.core.metadata.IPage;
|
|
12
|
12
|
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
|
|
13
|
13
|
import api.controller.BaseController;
|
|
14
|
|
-import api.entity.database.system.Dept;
|
|
15
|
|
-import api.entity.database.system.Role;
|
|
16
|
|
-import api.entity.database.system.User;
|
|
17
|
14
|
import api.entity.input.PageInput;
|
|
18
|
15
|
import api.model.AjaxResult;
|
|
19
|
16
|
import api.service.system.IDeptService;
|
|
|
@@ -72,6 +69,7 @@ public class UserController extends BaseController {
|
|
72
|
69
|
qw.eq(!StringHelper.isEmpty(input.getSex()), User::getSex, input.getSex());
|
|
73
|
70
|
qw.eq(!StringHelper.isEmpty(input.getStatus()), User::getStatus, input.getStatus());
|
|
74
|
71
|
qw.eq(User::getDelFlag, "0");
|
|
|
72
|
+ qw.orderByDesc(User::getUserId);
|
|
75
|
73
|
Page<User> page = GetPage(pageInput);
|
|
76
|
74
|
if (page != null) {
|
|
77
|
75
|
//IPage<User> iPage = userService.getListPage(page, qw);
|