Teams/shgx_tz_mes_backend_sync
3
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

优化数据返回

Browse Source
This commit is contained in:
不做码农
2022-01-11 10:49:38 +08:00
parent 617b34c884
commit b1bd8f12bb
5 changed files with 21 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
ZR.Admin.WebApi/Controllers/System/CodeGeneratorController.cs
View File

@@ -185,7 +185,7 @@ namespace ZR.Admin.WebApi.Controllers
}
}
return ToResponse(ResultCode.FAIL);
return ToResponse(ResultCode.FAIL, "生成失败");
}
/// <summary>

2
ZR.Admin.WebApi/Controllers/System/SysLoginController.cs
View File

@@ -74,7 +74,7 @@ namespace ZR.Admin.WebApi.Controllers.System
SysConfig sysConfig = sysConfigService.GetSysConfigByKey("sys.account.captchaOnOff");
if (sysConfig?.ConfigValue != "off" && CacheHelper.Get(loginBody.Uuid) is string str && !str.ToLower().Equals(loginBody.Code.ToLower()))
{
return CustomError(ResultCode.CAPTCHA_ERROR, "验证码错误");
return ToResponse(ResultCode.CAPTCHA_ERROR, "验证码错误");
}
var user = sysLoginService.Login(loginBody, AsyncFactory.RecordLogInfo(httpContextAccessor.HttpContext, "0", "login"));

5
ZR.Admin.WebApi/Controllers/System/SysMenuController.cs
View File

@@ -7,7 +7,6 @@ using ZR.Admin.WebApi.Extensions;
using ZR.Admin.WebApi.Filters;
using ZR.Model.System.Dto;
using ZR.Model.System;
using ZR.Service;
using ZR.Service.System.IService;
namespace ZR.Admin.WebApi.Controllers.System
@@ -151,11 +150,11 @@ namespace ZR.Admin.WebApi.Controllers.System
{
if (sysMenuService.HasChildByMenuId(menuId))
{
return CustomError(ResultCode.CUSTOM_ERROR, "存在子菜单,不允许删除");
return ToResponse(ResultCode.CUSTOM_ERROR, "存在子菜单,不允许删除");
}
if (sysMenuService.CheckMenuExistRole(menuId))
{
return CustomError(ResultCode.CUSTOM_ERROR, "菜单已分配,不允许删除");
return ToResponse(ResultCode.CUSTOM_ERROR, "菜单已分配,不允许删除");
}
int result = sysMenuService.DeleteMenuById(menuId);