禅道bug调整提交

代码/TVShoppingCallCenter_ZLJ/Controllers/System/DictionaryController.cs

@@ -147,7 +147,7 @@ namespace TVShoppingCallCenter_ZLJ.Controllers.System
         public async Task<IActionResult> AddAsync(DictionaryInput input)
         {
             if (string.IsNullOrEmpty(input.code))
-                return Error("字典标志不能为空");
+                return Error("字典标识不能为空");
             if (string.IsNullOrEmpty(input.name))
                 return Error("字典名称不能为空");
             if (input.isleaf)
@@ -160,7 +160,7 @@ namespace TVShoppingCallCenter_ZLJ.Controllers.System
             {
                 long n = await _sys_dictionaryRepository.GetCount(x => x.F_State == (int)EnumDelState.Enabled && x.F_ValueCode == input.code && x.F_IsLeaf == input.isleaf);
                 if (n > 0)
-                    return Error("字典标志已存在");
+                    return Error("字典标识已存在");
             }
             var model = new T_Sys_DictionaryValue();
             model.F_ValueCode = input.code;
@@ -192,7 +192,7 @@ namespace TVShoppingCallCenter_ZLJ.Controllers.System
         public async Task<IActionResult> UpdateAsync(DictionaryInput input)
         {
             if (string.IsNullOrEmpty(input.code))
-                return Error("字典标志不能为空");
+                return Error("字典标识不能为空");
             if (string.IsNullOrEmpty(input.name))
                 return Error("字典名称不能为空");
             if (input.id <= 0)

代码/TVShoppingCallCenter_ZLJ/Controllers/System/ModuleButtonInfoController.cs

@@ -31,7 +31,7 @@ namespace TVShoppingCallCenter_ZLJ.Controllers.System
             var list_ModuleInfoButton= new List<T_Sys_ModuleButtonInfo>();
             Expression<Func<T_Sys_ModuleButtonInfo, bool>> eq = a => a.F_State != (int)EnumDelState.Delete;
             if (menuid>0)
-                eq = eq.Or(b => b.F_MenuId == menuid);
+                eq = eq.And(b => b.F_MenuId == menuid);
 
             list_ModuleInfoButton = await _sys_modulebuttoninfoRepository.GetListALL(eq, o => o.F_Sort, SqlSugar.OrderByType.Asc);
 
@@ -69,7 +69,7 @@ namespace TVShoppingCallCenter_ZLJ.Controllers.System
 
             Expression<Func<T_Sys_ModuleButtonInfo, bool>> eq = a => a.F_State != (int)EnumDelState.Delete;
             if (moduleId > 0)
-                eq = eq.Or(b => b.F_MenuId == moduleId);
+                eq = eq.And(b => b.F_MenuId == moduleId);
 
             list_ModuleInfoButton = await _sys_modulebuttoninfoRepository.GetListALL(eq, o => o.F_Sort, SqlSugar.OrderByType.Asc);