wenkai.chen/tnb.server
Template
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

去除引用common.props

Browse Source
This commit is contained in:
潘飞
2023-11-06 19:35:59 +08:00
parent 6a2154edd9
commit c6b8dfc861
810 changed files with 3910 additions and 6695 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
system/Tnb.Systems/System/ModuleColumnService.cs
View File

@@ -12,7 +12,6 @@ using JNPF.Systems.Entitys.Permission;
using JNPF.Systems.Entitys.System;
using JNPF.Systems.Interfaces.System;
using JNPF.VisualDev.Engine;
using JNPF.VisualDev.Engine.Core;
using JNPF.VisualDev.Entitys;
using Mapster;
using Microsoft.AspNetCore.Mvc;
@@ -74,7 +73,7 @@ public class ModuleColumnService : IModuleColumnService, IDynamicApiController,
fullName = a.FullName,
enCode = SqlFunc.IF(a.FieldRule == 1 && !SqlFunc.IsNullOrEmpty(a.BindTable)).Return(a.EnCode.Replace("jnpf_" + a.BindTable + "_jnpf_", ""))
.ElseIF(b.Type == 3 && a.FieldRule == 1).Return(a.EnCode.Replace(a.BindTable + ".", ""))
.ElseIF(a.FieldRule == 2).Return(a.EnCode.Replace(a.ChildTableKey+"-", "")).End(a.EnCode),
.ElseIF(a.FieldRule == 2).Return(a.EnCode.Replace(a.ChildTableKey + "-", "")).End(a.EnCode),
id = a.Id,
sortCode = a.SortCode
}).ToListAsync();
@@ -91,7 +90,7 @@ public class ModuleColumnService : IModuleColumnService, IDynamicApiController,
{
var data = await _repository.GetFirstAsync(x => x.Id == id && x.DeleteMark == null);
if (data.FieldRule == 2 && data.ChildTableKey.IsNotEmptyOrNull())
data.EnCode = data.EnCode.Replace(data.ChildTableKey+"-", string.Empty);
data.EnCode = data.EnCode.Replace(data.ChildTableKey + "-", string.Empty);
var menu = await _repository.AsSugarClient().Queryable<ModuleEntity>().FirstAsync(x => x.Id == data.ModuleId && x.DeleteMark == null);
if (menu.IsNotEmptyOrNull() && data.BindTable.IsNotEmptyOrNull() && data.FieldRule == 1)
{
@@ -138,7 +137,7 @@ public class ModuleColumnService : IModuleColumnService, IDynamicApiController,
{
var entity = input.Adapt<ModuleColumnEntity>();
if (entity.FieldRule == 2 && input.childTableKey.IsNotEmptyOrNull())
entity.EnCode = input.childTableKey +"-"+ entity.EnCode;
entity.EnCode = input.childTableKey + "-" + entity.EnCode;
var menu = await _repository.AsSugarClient().Queryable<ModuleEntity>().FirstAsync(x => x.Id == input.moduleId && x.DeleteMark == null);
if (menu.IsNotEmptyOrNull() && entity.BindTable.IsNotEmptyOrNull() && entity.FieldRule == 1)
{
@@ -236,7 +235,7 @@ public class ModuleColumnService : IModuleColumnService, IDynamicApiController,
entity.FullName = item.fullName;
entity.BindTable = item.bindTable;
entity.FieldRule = item.fieldRule;
entity.ChildTableKey=item.childTableKey;
entity.ChildTableKey = item.childTableKey;
entity.SortCode = 0;
if (entity.FieldRule == 2 && item.childTableKey.IsNotEmptyOrNull())
entity.EnCode = item.childTableKey + "-" + entity.EnCode;