test-version22
/
MeterSphere
mirror of https://gitee.com/fit2cloud-feizhiyun/MeterSphere.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

fix(系统设置): 优化用户编辑时填写已存在邮箱的报错信息

This commit is contained in:
song-tianyang 2024-01-30 19:10:45 +08:00 committed by Craftsman
parent 4923456b6d
commit 55a6ecae3b
2 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
backend/services/system-setting/src/main/java/io/metersphere/system/service/UserService.java
View File

@ -204,10 +204,12 @@ public class UserService {
} }
} }
public UserEditRequest updateUser(UserEditRequest userEditRequest, String operator) { public UserEditRequest updateUser(UserEditRequest userEditRequest, String operator) {
//检查用户组合法性 //检查用户组合法性
globalUserRoleService.checkRoleIsGlobalAndHaveMember(userEditRequest.getUserRoleIdList(), true); globalUserRoleService.checkRoleIsGlobalAndHaveMember(userEditRequest.getUserRoleIdList(), true);
//检查用户邮箱的合法性
this.checkUserEmail(userEditRequest.getId(), userEditRequest.getEmail());
User user = new User(); User user = new User();
BeanUtils.copyBean(user, userEditRequest); BeanUtils.copyBean(user, userEditRequest);
user.setUpdateUser(operator); user.setUpdateUser(operator);

5
backend/services/system-setting/src/test/java/io/metersphere/system/controller/user/UserControllerTests.java
View File

@ -402,6 +402,7 @@ public class UserControllerTests extends BaseTest {
@Test @Test
@Order(5) @Order(5)
public void testUserUpdateError() throws Exception { public void testUserUpdateError() throws Exception {
this.checkUserList();
// 4xx 验证 // 4xx 验证
UserCreateInfo user = new UserCreateInfo(); UserCreateInfo user = new UserCreateInfo();
UserEditRequest userMaintainRequest; UserEditRequest userMaintainRequest;
@ -432,7 +433,9 @@ public class UserControllerTests extends BaseTest {
BeanUtils.copyBean(user, USER_LIST.get(0)); BeanUtils.copyBean(user, USER_LIST.get(0));
user.setEmail(USER_LIST.get(USER_LIST.size() - 1).getEmail()); user.setEmail(USER_LIST.get(USER_LIST.size() - 1).getEmail());
userMaintainRequest = UserParamUtils.getUserUpdateDTO(user, USER_ROLE_LIST); userMaintainRequest = UserParamUtils.getUserUpdateDTO(user, USER_ROLE_LIST);
this.requestPost(UserRequestUtils.URL_USER_UPDATE, userMaintainRequest, ERROR_REQUEST_MATCHER); MvcResult mvcResult = this.requestPost(UserRequestUtils.URL_USER_UPDATE, userMaintainRequest, ERROR_REQUEST_MATCHER).andReturn();
ResultHolder resultHolder = JSON.parseObject(mvcResult.getResponse().getContentAsString(StandardCharsets.UTF_8), ResultHolder.class);
Assertions.assertEquals(resultHolder.getMessage(), "用户邮箱已存在");
//用户组不包含系统成员 //用户组不包含系统成员
BeanUtils.copyBean(user, USER_LIST.get(0)); BeanUtils.copyBean(user, USER_LIST.get(0));
userMaintainRequest = UserParamUtils.getUserUpdateDTO(user, userMaintainRequest = UserParamUtils.getUserUpdateDTO(user,