|
|
|
@ -135,7 +135,7 @@ public class UsersController extends BaseController{
|
|
|
|
|
logger.info("login user {}, updateProcessInstance user, userName: {}, email: {}, tenantId: {}, userPassword: {}, phone: {}, user queue: {}", |
|
|
|
|
loginUser.getUserName(), userName, email, tenantId, Constants.PASSWORD_DEFAULT, phone,queue); |
|
|
|
|
try { |
|
|
|
|
Map<String, Object> result = usersService.updateUser(id,userName,userPassword,email,tenantId,phone,queue); |
|
|
|
|
Map<String, Object> result = usersService.updateUser(id, userName, userPassword, email, tenantId, phone, queue); |
|
|
|
|
return returnDataList(result); |
|
|
|
|
}catch (Exception e){ |
|
|
|
|
logger.error(UPDATE_USER_ERROR.getMsg(),e); |
|
|
|
@ -283,6 +283,26 @@ public class UsersController extends BaseController{
|
|
|
|
|
@GetMapping(value="/list") |
|
|
|
|
@ResponseStatus(HttpStatus.OK) |
|
|
|
|
public Result listUser(@RequestAttribute(value = Constants.SESSION_USER) User loginUser){ |
|
|
|
|
logger.info("login user {}, user list"); |
|
|
|
|
try{ |
|
|
|
|
Map<String, Object> result = usersService.queryAllGeneralUsers(loginUser); |
|
|
|
|
return returnDataList(result); |
|
|
|
|
}catch (Exception e){ |
|
|
|
|
logger.error(USER_LIST_ERROR.getMsg(),e); |
|
|
|
|
return error(Status.USER_LIST_ERROR.getCode(), Status.USER_LIST_ERROR.getMsg()); |
|
|
|
|
} |
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
/** |
|
|
|
|
* user list no paging |
|
|
|
|
* |
|
|
|
|
* @param loginUser |
|
|
|
|
* @return |
|
|
|
|
*/ |
|
|
|
|
@GetMapping(value="/list-all") |
|
|
|
|
@ResponseStatus(HttpStatus.OK) |
|
|
|
|
public Result listAll(@RequestAttribute(value = Constants.SESSION_USER) User loginUser){ |
|
|
|
|
logger.info("login user {}, user list"); |
|
|
|
|
try{ |
|
|
|
|
Map<String, Object> result = usersService.queryUserList(loginUser); |
|
|
|
@ -293,6 +313,7 @@ public class UsersController extends BaseController{
|
|
|
|
|
} |
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
/** |
|
|
|
|
* verify username |
|
|
|
|
* |
|
|
|
|