diff --git a/nursing-unit-system/nu-system-biz/src/main/java/org/jeecg/modules/system/controller/SysUserController.java b/nursing-unit-system/nu-system-biz/src/main/java/org/jeecg/modules/system/controller/SysUserController.java index d165102..451592b 100644 --- a/nursing-unit-system/nu-system-biz/src/main/java/org/jeecg/modules/system/controller/SysUserController.java +++ b/nursing-unit-system/nu-system-biz/src/main/java/org/jeecg/modules/system/controller/SysUserController.java @@ -1913,8 +1913,8 @@ public class SysUserController { */ @RequiresPermissions("system:user:initialization") @RequestMapping(value = "/initialization", method = RequestMethod.POST) - public Result initialization(@RequestBody JSONObject jsonObject) { - Result result = new Result(); + public Result> initialization(@RequestBody JSONObject jsonObject) { + Map result = new HashMap<>(); String selectedRoles = "f6817f48af4fb3af11b9e8bf182f618b"; String selectedDeparts = ""; try { @@ -1922,7 +1922,7 @@ public class SysUserController { SysDepart depart = sysDepartService.getDepartById(user.getOrgCode()); if(depart == null){ - return result.error500("未找到当前机构信息"); + return Result.error("未找到机构信息"); } selectedDeparts = depart.getId(); user.setOrgCode(depart.getOrgCode()); @@ -1950,11 +1950,11 @@ public class SysUserController { orgApplyInfo.setBuildStatus("5"); orgApplyInfoService.updateById(orgApplyInfo); - result.success("初始化成功!账号:" + jsonObject.getString("userName") + " 密码:123456"); + result.put("message","初始化成功!账号:" + jsonObject.getString("userName") + " 密码:123456"); } catch (Exception e) { log.error(e.getMessage(), e); - result.error500("操作失败"); + return Result.error("初始化失败!"); } - return result; + return Result.ok(result); } }