Merge branch 'dev' of ssh://git.tuotong-tech.com:9105/tnb/tnb.server into dev

Tnb.BasicData.Entitys/Dto/BasicDataTreeOutput.cs

@@ -0,0 +1,14 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using JNPF.Common.Security;
+
+namespace Tnb.BasicData.Entitys.Dto
+{
+    public class BasicDataTreeOutput : TreeModel
+    {
+
+    }
+}

Tnb.BasicData.Entitys/Dto/DataModeing/CleanTableDataInput.cs

@@ -0,0 +1,26 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using JNPF.DependencyInjection;
+
+namespace Tnb.BasicData.Entitys.Dto.DataModeing
+{
+    /// <summary>
+    /// 清除表数据输入参数
+    /// </summary>
+    [SuppressSniffer]
+    public class CleanTableDataInput
+    {
+        public string LinkId { get; set; }
+        /// <summary>
+        /// 数据库名称
+        /// </summary>
+        public string DbName { get; set; }
+        /// <summary>
+        /// 表名称 
+        /// </summary>
+        public string TableName { get; set; }
+    }
+}

Tnb.BasicData.Entitys/Tnb.BasicData.Entitys.csproj

@@ -1,4 +1,4 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
     <TargetFramework>net6.0</TargetFramework>
@@ -11,8 +11,4 @@
     <ProjectReference Include="..\common\Tnb.SqlSugar\Tnb.SqlSugar.csproj" />
   </ItemGroup>
 
-  <ItemGroup>
-    <Folder Include="Dto\" />
-  </ItemGroup>
-
 </Project>

Tnb.BasicData/DataTableOperateService.cs

@@ -0,0 +1,72 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using JNPF.Common.Configuration;
+using JNPF.Common.Core.Manager;
+using JNPF.DependencyInjection;
+using JNPF.DynamicApiController;
+using JNPF.Systems.Entitys.System;
+using JNPF.Systems.Interfaces.System;
+using Microsoft.AspNetCore.Mvc;
+using Org.BouncyCastle.Bcpg.OpenPgp;
+using Senparc.Weixin.MP.AdvancedAPIs.NewTmpl.NewTmplJson;
+using SqlSugar;
+using Tnb.BasicData.Entitys.Dto.DataModeing;
+
+namespace Tnb.BasicData
+{
+    /// <summary>
+    /// 数据库表操作服务
+    /// </summary>
+    [ApiDescriptionSettings(Tag = "BasicData", Name = "Table", Order = 701)]
+    [Route("api/basic/db/[controller]")]
+    public class DataTableOperateService : IDynamicApiController, ITransient
+    {
+        private readonly DataBaseManager _dataBaseManager;
+        private readonly ISqlSugarRepository<DbLinkEntity> _repository;
+        private readonly IDbLinkService _dbLinkService;
+        public DataTableOperateService(
+            DataBaseManager dataBaseManager,
+            ISqlSugarRepository<DbLinkEntity> repository,
+            IDbLinkService dbLinkService
+            )
+        {
+            _dataBaseManager = dataBaseManager;
+            _repository = repository;
+            _dbLinkService = dbLinkService;
+        }
+        /// <summary>
+        /// 清除表数据
+        /// </summary>
+        /// <param name="input"></param>
+        /// <returns></returns>
+        [HttpPost("clean-data")]
+        public async Task<dynamic> CleanTableData(CleanTableDataInput input)
+        {
+            var link = await _dbLinkService.GetInfo(input.LinkId);
+            var sugarClient = _dataBaseManager.ChangeDataBase(link);
+            return await sugarClient.Deleteable<object>().AS(input.TableName).ExecuteCommandAsync();
+        }
+
+        public async Task<dynamic> GenerateCode(CleanTableDataInput input)
+        {
+            var dir = Path.Combine(FileVariable.GenerateCodePath, "DbModel");
+            if (!Directory.Exists(dir))
+            {
+                Directory.CreateDirectory(dir);
+            }
+            var link = await _dbLinkService.GetInfo(input.LinkId);
+            var sugarClient = _dataBaseManager.ChangeDataBase(link);
+            var pos = input.TableName.IndexOf("_", StringComparison.Ordinal);
+          
+
+            //sugarClient.DynamicBuilder().CreateClass();
+            sugarClient.DbFirst.Where(input.TableName).CreateClassFile(FileVariable.GenerateCodePath, "DbModels");
+
+            return null;
+
+        }
+    }
+}

system/Tnb.Systems/Permission/UsersService.cs

@@ -534,14 +534,16 @@ public class UsersService : IUsersService, IDynamicApiController, ITransient
     [HttpPost("GetUserList")]
     public async Task<dynamic> GetUserList([FromBody] UserRelationInput input)
     {
-        var data = await _repository.AsQueryable().Where(it => it.EnabledMark > 0 && it.DeleteMark == null)
+        var data = await _repository.AsSugarClient().Queryable<UserEntity, OrganizeEntity>((u, org) => new JoinQueryInfos(JoinType.Inner, u.OrganizeId == org.Id))
-            .Where(it => input.userId.Contains(it.Id))
+            .Where((u, org) => u.EnabledMark > 0 && u.DeleteMark == null)
-            .Select(it => new OrganizeMemberListOutput()
+            .Where((u, org) => input.userId.Contains(u.Id))
+            .Select((u, org) => new OrganizeMemberListOutput()
             {
-                id = it.Id,
+                id = u.Id,
-                fullName = SqlFunc.MergeString(it.RealName, "/", it.Account),
+                fullName = SqlFunc.MergeString(u.RealName, "/", u.Account),
-                headIcon = SqlFunc.MergeString("/api/File/Image/userAvatar/", it.HeadIcon),
+                headIcon = SqlFunc.MergeString("/api/File/Image/userAvatar/", u.HeadIcon),
-                enabledMark = it.EnabledMark,
+                enabledMark = u.EnabledMark,
+                type = org.FullName,
             }).ToListAsync();
 
         data = data.OrderBy(x => input.userId.IndexOf(x.id)).ToList();