From f2b71fe1d3c2b7651d525a5b5bbe66fad602ea06 Mon Sep 17 00:00:00 2001
From: 啊鑫 <t2856754968@163.com>
Date: 星期二, 09 九月 2025 18:46:28 +0800
Subject: [PATCH] 代码清理
---
WebApi/Gs.Sys/Services/OrganizationController.cs | 175 +++++++++++++++++++++++++++-------------------------------
1 files changed, 81 insertions(+), 94 deletions(-)
diff --git a/WebApi/Gs.Sys/Services/OrganizationController.cs b/WebApi/Gs.Sys/Services/OrganizationController.cs
index 6b98c76..f8cd091 100644
--- a/WebApi/Gs.Sys/Services/OrganizationController.cs
+++ b/WebApi/Gs.Sys/Services/OrganizationController.cs
@@ -38,7 +38,7 @@
[RequestMethod(RequestMethods.POST)]
public ReturnDto<PageList<SysOrganization>> GetListPage(PageQuery query)
{
- string keyWord = query.keyWord;
+ var keyWord = query.keyWord;
var pageList = new PageList<SysOrganization>();
try
{
@@ -55,20 +55,22 @@
query.everyPageSize);
if (!string.IsNullOrEmpty(keyWord))
{
- System.Text.StringBuilder sbOrg = new StringBuilder();
- System.Data.DataSet dataSet = new System.Data.DataSet();
- dataSet = Gs.Toolbox.DbHelperSQL.Query(" select org_fid from [dbo].[SYS_USER_ORG] where user_guid='" + keyWord + "' order by org_fid asc");
+ var sbOrg = new StringBuilder();
+ var dataSet = new DataSet();
+ dataSet = DbHelperSQL.Query(
+ " select org_fid from [dbo].[SYS_USER_ORG] where user_guid='" +
+ keyWord + "' order by org_fid asc");
if (dataSet != null && dataSet.Tables.Count > 0)
- {
foreach (DataRow _row in dataSet.Tables[0].Rows)
{
if (sbOrg.Length > 0)
sbOrg.Append(", ");
- sbOrg.Append(_row["org_fid"].ToString());
+ sbOrg.Append(_row["org_fid"]);
}
- }
+
pageList.extendText = sbOrg.ToString();
}
+
return ReturnDto<PageList<SysOrganization>>.QuickReturn(pageList,
ReturnCode.Success, "璇诲彇鎴愬姛");
}
@@ -79,96 +81,81 @@
}
}
- ///// <summary>
- ///// 鍒犻櫎鏈烘瀯
- ///// </summary>
- ///// <param name="model"></param>
- ///// <returns></returns>
- //[RequestMethod(RequestMethods.POST)]
- //public ReturnDto<int?> DeleteModel([FromBody] JArray guidList)
- //{
- // string[] intArray = guidList.ToObject<string[]>();
- // string guid = intArray[0];
+ /// <summary>
+ /// 鏌ヨ鍒楄〃锛屾敮鎸佸垎椤碉紝鐢ㄤ簬鍚勭缁戝畾
+ /// </summary>
+ /// <param name="query"></param>
+ /// <returns></returns>
+ [RequestMethod(RequestMethods.POST)]
+ public ReturnDto<PageList<dynamic>> GetListPage2(PageQuery model)
+ {
+ var currentPage = model.currentPage;
+ var everyPageSize = model.everyPageSize;
+ var sortName = string.IsNullOrEmpty(model.sortName)
+ ? "a.FNumber"
+ : model.sortName;
+ var keyWhere = model.keyWhere;
+ var keyType = model.keyType;
+ var sbSql = new StringBuilder();
+ sbSql.Append("select * from ");
+ sbSql.Append("( ");
+ sbSql.Append("select top 100000 ROW_NUMBER() over(order by " +
+ sortName + " " + model.sortOrder + ") as rowIndex,a.* ");
+ if (string.IsNullOrEmpty(keyType))
+ sbSql.Append(",cast(0 as bit) as chkInt");
+ else
+ sbSql.Append(
+ ",cast( (select count(1) from SYS_USER_BIND b where b.userGuid='" +
+ keyType +
+ "' and b.aboutGuid=cast( a.FID as nvarchar(50)) and b.fType='缁勭粐') as bit) as chkInt ");
+ sbSql.Append(" from SYS_ORGANIZATION a ");
+ sbSql.Append(keyWhere);
+ sbSql.Append(") as T ");
+ sbSql.Append(" where T.rowindex>(" + currentPage + "-1)*" +
+ everyPageSize + " and T.rowindex<=" + currentPage + "*" +
+ everyPageSize);
+ sbSql.Append(" order by rowindex asc ");
+ sbSql.Append(
+ " select count(1) as intTotal from SYS_ORGANIZATION a where 1=1 ");
+ sbSql.Append(keyWhere);
+ var dset = new DataSet();
+ try
+ {
+ dset = DbHelperSQL.Query(sbSql.ToString());
+ }
+ catch (Exception ex)
+ {
+ LogHelper.Debug(ToString(), "GetListPage2 error锛�" + ex.Message);
+ return ReturnDto<PageList<dynamic>>.QuickReturn(
+ default(PageList<dynamic>), ReturnCode.Exception, "璇诲彇澶辫触");
+ }
- // int cont = 0;
- // cont = IsChkOrUnChk(intArray[0], true);
- // if (cont > 0)
- // return ReturnDto<int>.QuickReturn(default(int?), ReturnCode.Exception, "鍒犻櫎澶辫触锛岃淇℃伅宸茶瀹℃牳锛�");
+ var _pglist = new PageList<dynamic>
+ {
+ total = 0,
+ everyPageSize = 0,
+ pages = 0,
+ list = new List<dynamic>()
+ };
+ if (dset != null && dset.Tables.Count > 0 &&
+ dset.Tables[0].Rows.Count > 0) //鏈夋暟鎹�
+ {
+ var intTotal =
+ int.Parse(dset.Tables[1].Rows[0]["intTotal"].ToString());
+ var pages = intTotal % everyPageSize != 0
+ ? intTotal / everyPageSize + 1
+ : intTotal / everyPageSize;
+ _pglist.total = intTotal;
+ _pglist.everyPageSize = everyPageSize;
+ _pglist.pages = pages;
+ var _dy = dset.Tables[0].TableToDynamicList();
+ _pglist.list = _dy;
+ }
+ return ReturnDto<PageList<dynamic>>.QuickReturn(_pglist,
+ ReturnCode.Success, "璇诲彇鎴愬姛");
+ }
- // int? rtnInt = (int)ReturnCode.Default;
-
- // int it1 = 0;
- // int it2 = 0;
- // cont = Db.Queryable<SysOrganization>().Where(c => c.Guid == Guid.Parse(guid) && c.IsSys == 1).Count();
- // if (cont > 0)
- // {
- // return ReturnDto<int>.QuickReturn(default(int?), ReturnCode.Exception, "鍒犻櫎澶辫触锛岃鏉＄洰涓虹郴缁熷唴缃紝涓嶅彲鍒犻櫎锛�");
- // }
- // try
- // {
- // Db.Ado.BeginTran();
- // it1 = Db.Deleteable<SysOrganization>().In(guid).ExecuteCommand();
- // it2 = Db.Deleteable<SysRoleMenuAction>().Where(it => it.OrgGuid == Guid.Parse(guid)).ExecuteCommand();
- // Db.Ado.CommitTran();
- // }
- // catch (Exception ex)
- // {
- // LogHelper.Debug(this.ToString(), "DeleteModel error锛�" + ex.Message);
- // Db.Ado.RollbackTran();
- // return ReturnDto<int>.QuickReturn(rtnInt, ReturnCode.Exception, "鍒犻櫎澶辫触锛岃閲嶈瘯锛�");
- // }
- // rtnInt = (it2 + it1);
- // return ReturnDto<int>.QuickReturn(rtnInt, ReturnCode.Success, "鎿嶄綔鎴愬姛锛屽叡鍒犻櫎" + rtnInt.ToString() + "鏉℃暟鎹紒");
- //}
-
- ///// <summary>
- ///// 澧炲姞鏈烘瀯
- ///// </summary>
- ///// <param name="model"></param>
- ///// <returns></returns>
- //[RequestMethod(RequestMethods.POST)]
- //public ReturnDto<string?> EditModel([FromBody] SysOrganization model)
- //{
- // if (UtilityHelper.CheckGuid(model.Guid))
- // {
- // int cont = 0;
- // cont = IsChkOrUnChk(model.Guid.ToString(), true);
- // if (cont > 0)
- // return ReturnDto<string>.QuickReturn("", ReturnCode.Exception, "淇敼澶辫触锛岃淇℃伅宸茶瀹℃牳锛�");
- // }
- // if (!UtilityHelper.CheckGuid(model.UpGuid))//鍙兘鏈変竴涓牴缁勭粐
- // {
- // int cont = 0;
- // cont = Db.Queryable<SysOrganization>().Where(c => c.UpGuid == null).Count();
- // if (cont > 0)
- // {
- // return ReturnDto<int>.QuickReturn(default(string?), ReturnCode.Exception, "澧炲姞澶辫触锛岃閫夋嫨涓婄骇缁勭粐锛�");
- // }
- // }
- // bool _bl = false;
- // try
- // {
- // if (!UtilityHelper.CheckGuid(model.Guid))
- // {
- // model.Guid = Guid.NewGuid();
- // _bl = base.Insert(model);
- // }
- // else
- // {
- // // _bl = base.Update(model);
- // _bl = Db.Updateable(model).IgnoreColumns(ignoreAllNullColumns: true).ExecuteCommand() > 0 ? true : false;
- // }
- // }
- // catch (Exception ex)
- // {
- // LogHelper.Debug(this.ToString(), "EditModel error锛�" + ex.Message);
- // return ReturnDto<string>.QuickReturn("", ReturnCode.Exception, ex.Message);
- // }
- // if (_bl)
- // return ReturnDto<string>.QuickReturn(model.Guid.ToString(), ReturnCode.Success, "鎿嶄綔鎴愬姛锛�");
- // return ReturnDto<string>.QuickReturn("", ReturnCode.Exception, "澧炲姞澶辫触锛岃閲嶈瘯锛�");
- //}
/// <summary>
/// 璇诲彇鏈烘瀯
--
Gitblit v1.9.3