...

examcloud-core-basic-api-provider/src/main/java/cn/com/qmth/examcloud/core/basic/api/controller/UserController.java

@@ -41,7 +41,7 @@ import cn.com.qmth.examcloud.commons.web.helpers.page.PageInfo;
 import cn.com.qmth.examcloud.commons.web.security.bean.User;
 import cn.com.qmth.examcloud.commons.web.security.enums.RoleMeta;
 import cn.com.qmth.examcloud.commons.web.support.ControllerSupport;
-import cn.com.qmth.examcloud.core.basic.api.controller.bean.FullUserInfo;
+import cn.com.qmth.examcloud.core.basic.api.controller.bean.UserDomain;
 import cn.com.qmth.examcloud.core.basic.api.controller.bean.UserForm;
 import cn.com.qmth.examcloud.core.basic.base.enums.AccountType;
 import cn.com.qmth.examcloud.core.basic.dao.OrgRepo;
@@ -100,7 +100,7 @@ public class UserController extends ControllerSupport {
 	 */
 	@ApiOperation(value = "查询所有用户", notes = "")
 	@GetMapping("/all/{curPage}/{pageSize}")
-	public PageInfo<FullUserInfo> getAllUser(@PathVariable Integer curPage,
+	public PageInfo<UserDomain> getAllUser(@PathVariable Integer curPage,
 			@PathVariable Integer pageSize, @RequestParam Long rootOrgId,
 			@RequestParam String loginName, @RequestParam String name,
 			@RequestParam(required = false) Boolean enable,
@@ -164,10 +164,10 @@ public class UserController extends ControllerSupport {
 
 		Iterator<UserEntity> iterator = userList.iterator();
 
-		List<FullUserInfo> fullUserInfoList = Lists.newArrayList();
+		List<UserDomain> fullUserInfoList = Lists.newArrayList();
 		while (iterator.hasNext()) {
 			UserEntity next = iterator.next();
-			FullUserInfo bean = new FullUserInfo();
+			UserDomain bean = new UserDomain();
 			bean.setId(next.getId());
 			bean.setLoginName(next.getLoginName());
 			bean.setName(next.getName());
@@ -205,7 +205,7 @@ public class UserController extends ControllerSupport {
 			fullUserInfoList.add(bean);
 		}
 
-		PageInfo<FullUserInfo> ret = new PageInfo<FullUserInfo>();
+		PageInfo<UserDomain> ret = new PageInfo<UserDomain>();
 		ret.setList(fullUserInfoList);
 		ret.setTotal(userList.getTotalElements());
 		return ret;

examcloud-core-basic-api-provider/src/main/java/cn/com/qmth/examcloud/core/basic/api/controller/bean/FullUserInfo.java → examcloud-core-basic-api-provider/src/main/java/cn/com/qmth/examcloud/core/basic/api/controller/bean/UserDomain.java

@@ -12,7 +12,7 @@ import cn.com.qmth.examcloud.commons.web.cloud.api.JsonSerializable;
  * @date 2018年6月25日
  * @Copyright (c) 2018-? http://qmth.com.cn All Rights Reserved.
  */
-public class FullUserInfo implements JsonSerializable {
+public class UserDomain implements JsonSerializable {
 
 	private static final long serialVersionUID = -1326157272669439949L;