|
@@ -76,6 +76,20 @@ public class UserController extends ControllerSupport {
|
|
@Autowired
|
|
@Autowired
|
|
RoleRepo roleRepo;
|
|
RoleRepo roleRepo;
|
|
|
|
|
|
|
|
+ /**
|
|
|
|
+ * 重新定义
|
|
|
|
+ *
|
|
|
|
+ * @author WANGWEI
|
|
|
|
+ * @param curPage
|
|
|
|
+ * @param pageSize
|
|
|
|
+ * @param rootOrgId
|
|
|
|
+ * @param loginName
|
|
|
|
+ * @param name
|
|
|
|
+ * @param enable
|
|
|
|
+ * @param roleId
|
|
|
|
+ * @param type
|
|
|
|
+ * @return
|
|
|
|
+ */
|
|
@ApiOperation(value = "查询所有用户", notes = "")
|
|
@ApiOperation(value = "查询所有用户", notes = "")
|
|
@GetMapping("/all/{curPage}/{pageSize}")
|
|
@GetMapping("/all/{curPage}/{pageSize}")
|
|
public PageInfo<FullUserInfo> getAllUser(@PathVariable Integer curPage,
|
|
public PageInfo<FullUserInfo> getAllUser(@PathVariable Integer curPage,
|
|
@@ -104,7 +118,7 @@ public class UserController extends ControllerSupport {
|
|
String roleCode = roleEntity.getCode();
|
|
String roleCode = roleEntity.getCode();
|
|
|
|
|
|
Pageable pageable = new PageRequest(curPage - 1, pageSize, Sort.Direction.DESC,
|
|
Pageable pageable = new PageRequest(curPage - 1, pageSize, Sort.Direction.DESC,
|
|
- "update_time");
|
|
|
|
|
|
+ "updateTime");
|
|
|
|
|
|
loginName = "%" + loginName.trim() + "%";
|
|
loginName = "%" + loginName.trim() + "%";
|
|
name = "%" + name.trim() + "%";
|
|
name = "%" + name.trim() + "%";
|