Commit f422a87a authored by gaoliwei's avatar gaoliwei

修改新增用户接口

parent 94b1011b
......@@ -37,8 +37,8 @@ public class UserController extends PaginationController<SysUser> {
SysAdmins sysAdmins = userDto.getSysAdmins();
SysOwner sysOwner = userDto.getSysOwner();
SysPrincipal sysPrincipal = userDto.getSysPrincipal();
String data = userService.saveUser(sysUser, sysAdmins, sysOwner, sysPrincipal);
return Result.builder(new PersistModel(1), MessageConstant.MESSAGE_ALERT_SUCCESS, MessageConstant.MESSAGE_ALERT_ERROR,data);
int flag = userService.saveUser(sysUser, sysAdmins, sysOwner, sysPrincipal);
return Result.builder(new PersistModel(flag));
}
@ApiOperation(value = "通过用户ID删除用户")
......
......@@ -28,7 +28,7 @@ public interface UserService {
* @param sysPrincipal
* @return
*/
String saveUser(SysUser sysUser, SysAdmins sysAdmins, SysOwner sysOwner,SysPrincipal sysPrincipal);
int saveUser(SysUser sysUser, SysAdmins sysAdmins, SysOwner sysOwner,SysPrincipal sysPrincipal);
/** 修改系统用户
......
......@@ -74,9 +74,12 @@ public class UserServiceImpl implements UserService {
}
@Override
public String saveUser(SysUser sysUser, SysAdmins sysAdmins, SysOwner sysOwner, SysPrincipal sysPrincipal) {
String result = "添加失败";
public int saveUser(SysUser sysUser, SysAdmins sysAdmins, SysOwner sysOwner, SysPrincipal sysPrincipal) {
int flag = 0;
String userNm = sysUser.getUserNm();
List<SysUser> flagSysUsers = userRepository.listByUserName(userNm);
if (flagSysUsers.size()<0){
String userId = IdGen.uuid();
sysUser.setUserPwd(passwordEncoder.encode(UserPassWordConstant.PASSWORD));
sysUser.setUserId(userId);
......@@ -95,7 +98,7 @@ public class UserServiceImpl implements UserService {
relUserRole.setRoleId(SysRoleConstant.TP_ADMIN_ID);
relUserRoleRepository.insertSelective(relUserRole);
result = "添加管理员成功";
flag = 1;
}
if (UserTpConstant.TP_OWNER.equals(userTp)) {
userRepository.insertSelective(sysUser);
......@@ -109,7 +112,7 @@ public class UserServiceImpl implements UserService {
relUserRole.setRoleId(SysRoleConstant.TP_OWNER_ID);
relUserRoleRepository.insertSelective(relUserRole);
result = "添加业主成功";
flag = 1;
}
if (UserTpConstant.TP_PRINCIPAL.equals(userTp)) {
userRepository.insertSelective(sysUser);
......@@ -123,13 +126,14 @@ public class UserServiceImpl implements UserService {
relUserRole.setRoleId(SysRoleConstant.TP_PRINCIPAL_ID);
relUserRoleRepository.insertSelective(relUserRole);
result = "添加团队负责人成功";
flag = 1;
}
return result;
return flag;
} catch (Exception e) {
e.printStackTrace();
}
return "添加失败";
}
return flag;
}
@Override
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment