|
@@ -103,7 +103,7 @@ public class SysUserController extends BaseController {
|
103
|
103
|
queryWrapper.gt("status", Constants.STATUS_DELETE);
|
104
|
104
|
queryWrapper.ne("user_id", Constants.ROOT_ID);
|
105
|
105
|
queryWrapper.orderByDesc("create_date");
|
106
|
|
- IPage<SysUser> result = sysUserService.page(pg);
|
|
106
|
+ IPage<SysUser> result = sysUserService.page(pg, queryWrapper);
|
107
|
107
|
|
108
|
108
|
return ResponseBean.success(result);
|
109
|
109
|
}
|
|
@@ -120,6 +120,24 @@ public class SysUserController extends BaseController {
|
120
|
120
|
sysUserService.mergeData(sysUser);
|
121
|
121
|
return ResponseBean.success(sysUser);
|
122
|
122
|
}
|
|
123
|
+
|
|
124
|
+ /**
|
|
125
|
+ * 更新数据
|
|
126
|
+ *
|
|
127
|
+ * @param id 实例ID
|
|
128
|
+ * @return 实例对象
|
|
129
|
+ */
|
|
130
|
+ @ApiOperation("更新数据")
|
|
131
|
+ @PutMapping("/sysUser/{id}/status")
|
|
132
|
+ public ResponseBean edit(@ApiParam("对象ID") @PathVariable String id,
|
|
133
|
+ @ApiParam("页码") @RequestParam(value = "status") Integer status) throws Exception {
|
|
134
|
+
|
|
135
|
+ SysUser sysUser = sysUserService.getById(id);
|
|
136
|
+ sysUser.setStatus(status);
|
|
137
|
+
|
|
138
|
+ sysUserService.updateById(sysUser);
|
|
139
|
+ return ResponseBean.success(sysUser);
|
|
140
|
+ }
|
123
|
141
|
|
124
|
142
|
// /**
|
125
|
143
|
// * 更新数据
|