Commit 3ff65a3a authored by wzp's avatar wzp

修改用户添加

parent 5f04986b
...@@ -177,7 +177,7 @@ public class TUserController extends BaseController { ...@@ -177,7 +177,7 @@ public class TUserController extends BaseController {
@ApiOperation(value = "新增成员") @ApiOperation(value = "新增成员")
@RequestMapping(value = "/add", method = RequestMethod.POST) @RequestMapping(value = "/add", method = RequestMethod.POST)
@RequiresPermissions("/user/add") @RequiresPermissions("/user/add")
@MethodLog(operModule = OperModule.USER, operType = OperType.ADD) // @MethodLog(operModule = OperModule.USER, operType = OperType.ADD)
public Map<String, Object> add(@RequestBody TUser user) { public Map<String, Object> add(@RequestBody TUser user) {
Map<String, Object> resultMap = new LinkedHashMap<String, Object>(); Map<String, Object> resultMap = new LinkedHashMap<String, Object>();
try { try {
...@@ -195,9 +195,14 @@ public class TUserController extends BaseController { ...@@ -195,9 +195,14 @@ public class TUserController extends BaseController {
} }
if (user.getRoleList() == null || user.getRoleList().size() < 1) { if (user.getRoleList() == null || user.getRoleList().size() < 1) {
resultMap.put("resultCode", 400); if ("2".equals(user.getType())){
resultMap.put("message", "请选择角色!"); user.setRoleList(new ArrayList<>());
return resultMap; user.getRoleList().add("1");
}else {
resultMap.put("resultCode", 400);
resultMap.put("message", "请选择角色!");
return resultMap;
}
} }
if (StringUtils.isBlank(user.getOrgId())) { if (StringUtils.isBlank(user.getOrgId())) {
resultMap.put("resultCode", 400); resultMap.put("resultCode", 400);
...@@ -232,6 +237,7 @@ public class TUserController extends BaseController { ...@@ -232,6 +237,7 @@ public class TUserController extends BaseController {
boolean ret = this.userService.save(user); boolean ret = this.userService.save(user);
List<String> list = user.getRoleList(); List<String> list = user.getRoleList();
List<TUserRole> list1 = new ArrayList<>(); List<TUserRole> list1 = new ArrayList<>();
for (String s : list) { for (String s : list) {
TUserRole entity = new TUserRole(); TUserRole entity = new TUserRole();
......
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