Merge branch 'test' of http://110.188.24.182:10023/Fengwo/hotline into test

src/Hotline.Api/Controllers/IndustrialManagementController.cs

@@ -56,8 +56,8 @@ namespace Hotline.Api.Controllers
         /// 获取部门
         /// </summary>
         /// <returns></returns>
-        [HttpGet("getorglist")]
-        public async Task<List<IndustrialOrgs>> GetOrgList()
+        [HttpGet("getorglist/{id}")]
+        public async Task<List<IndustrialOrgs>> GetOrgList(string id)
         {
             var list = await _systemOrganizeRepository.Queryable()
                      .Select(p => new IndustrialOrgs
@@ -66,7 +66,7 @@ namespace Hotline.Api.Controllers
                          OrgName = p.Name,
                          ParentId = p.ParentId,
                          ParentName = p.ParentId,
-                         IsDisable = SqlFunc.Subqueryable<IndustryAssociations>().Where(d => d.OrganizeId == p.Id).Any()
+                         IsDisable = SqlFunc.Subqueryable<IndustryAssociations>().Where(d => d.OrganizeId == p.Id).WhereIF(!string.IsNullOrEmpty(id), d => d.IndustrialManagementId != id).Any()
                      })
                      .ToTreeAsync(d => d.Children, it => it.ParentId, null);
 

src/Hotline.Api/Controllers/OrderController.cs

@@ -5936,7 +5936,7 @@ public class OrderController : BaseController
                 NextStepCode = dto.NextStepCode,
                 NextStepName = dto.NextStepName,
                 NextHandlers = dto.NextHandlers,
-                Opinion = "【特提理由】" + dto.Cause,
+                Opinion = "【特提理由】" + dto.Reason,
                 FlowDirection = dto.FlowDirection,
                 HandlerType = dto.HandlerType,
                 BusinessType = dto.BusinessType

src/Hotline.Application/Orders/OrderApplication.cs

@@ -1816,6 +1816,8 @@ public class OrderApplication : IOrderApplication, IScopeDependency
             .Where(x => x.OrderSpecial.SpecialType == ESpecialType.ReTransact || x.OrderSpecial.SpecialType == ESpecialType.SendBack)
             .Where(x => x.OrderSpecial.CreationTime >= dto.StartTime)
             .Where(x => x.OrderSpecial.CreationTime <= dto.EndTime)
+            .WhereIF(!_sessionContext.OrgIsCenter,x=>x.OrgId.StartsWith(_sessionContext.RequiredOrgId))
+            .MergeTable()
             .GroupBy(x => new { Time = x.OrderSpecial.CreationTime.ToString("yyyy-MM-dd"), x.OrgId, x.OrgName })
             .Select(x => new OrderReTransactVo
             {
@@ -1843,6 +1845,7 @@ public class OrderApplication : IOrderApplication, IScopeDependency
             .WhereIF(!string.IsNullOrEmpty(dto.OrgName), x => x.OrgName.Contains(dto.OrgName!))
             .WhereIF(!string.IsNullOrEmpty(dto.ErrorName), x => x.ErrorName.Contains(dto.ErrorName!))
             .WhereIF(!string.IsNullOrEmpty(dto.No), x => x.OrderSpecial!.Order!.No!.Contains(dto.No!))
+            .WhereIF(!_sessionContext.OrgIsCenter, x => x.OrgId.StartsWith(_sessionContext.RequiredOrgId))
             .Where(x => x.OrderSpecial.SpecialType == ESpecialType.ReTransact || x.OrderSpecial.SpecialType == ESpecialType.SendBack)
             .Where(x => x.OrderSpecial.CreationTime >= dto.StartTime)
             .Where(x => x.OrderSpecial.CreationTime <= dto.EndTime);