+1

OASystem/OASystem.Api/Controllers/ResourceController.cs

@@ -38,12 +38,13 @@ namespace OASystem.API.Controllers
         private readonly AskDataRepository _askDataRep;
         private readonly TicketBlackCodeRepository _ticketBlackCodeRep;
         private readonly TourClientListRepository _tourClientListRep;
+        private readonly DelegationInfoRepository _delegationInfoRep;
 
         public ResourceController(IMapper mapper, IConfiguration config, SqlSugarClient sqlSugar, CarDataRepository carDataRep, LocalGuideDataRepository localGuideDataRep,
             ThreeCodeRepository threeCodeRep, HotelDataRepository hotelDataRep, ResItemInfoRepository resItemInfoRep, SetDataRepository setDataRepository,
             CountryFeeRepository countryFeeRep, SetDataTypeRepository setDataTypeRep, AirTicketAgentRepository airTicketAgentRep,
             InvitationOfficialActivityDataRepository invitationOfficialActivityDataRep, OfficialActivitiesRepository officialActivitiesRep, AskDataRepository askDataRep,
-            TicketBlackCodeRepository ticketBlackCodeRep, TourClientListRepository tourClientListRep)
+            TicketBlackCodeRepository ticketBlackCodeRep, TourClientListRepository tourClientListRep, DelegationInfoRepository delegationInfoRep)
         {
             _mapper = mapper;
             _config = config;
@@ -62,6 +63,7 @@ namespace OASystem.API.Controllers
             _askDataRep = askDataRep;
             _ticketBlackCodeRep = ticketBlackCodeRep;
             _tourClientListRep = tourClientListRep;
+            _delegationInfoRep = delegationInfoRep;
         }
 
 
@@ -1552,11 +1554,16 @@ Inner Join Sys_Department as d With(Nolock) On u.DepId=d.Id Where m.Id={0} ", _m
         [ProducesResponseType(typeof(JsonView), StatusCodes.Status200OK)]
         public async Task<IActionResult> GetGroupAllList(OfficialActivitiesByDiIdDto dto)
         {
-            string groupSql = string.Format("Select * From Grp_DelegationInfo With(NoLock) Where IsDel = 0 Order By CreateTime Desc");
-            List<Grp_DelegationInfo> _DelegationInfos = _sqlSugar.SqlQueryable< Grp_DelegationInfo >(groupSql).ToList();
+            //string groupSql = string.Format("Select * From Grp_DelegationInfo With(NoLock) Where IsDel = 0 Order By CreateTime Desc");
+            //List<Grp_DelegationInfo> _DelegationInfos = _sqlSugar.SqlQueryable< Grp_DelegationInfo >(groupSql).ToList();
+
+            var _groupData = await _delegationInfoRep.PostShareGroupInfos(1);
+            dynamic groupInfos = null;
+            if (_groupData.Code == 0) groupInfos = _groupData.Data;
+
             List<Sys_SetData> data = _sqlSugar.Queryable<Sys_SetData>().Where(a => a.IsDel == 0 && a.STid == 38).ToList();
             List<Grp_DeleFile> _DeleFile = _sqlSugar.Queryable<Grp_DeleFile>().Where(a => a.Diid == dto.DiId && a.IsDel == 0 && a.Category == 970).ToList();
-            return Ok(JsonView(true, "查询成功！", new { Delegation = _DelegationInfos, SetData = data, DeleFile = _DeleFile }));
+            return Ok(JsonView(true, "查询成功！", new { Delegation = groupInfos, SetData = data, DeleFile = _DeleFile }));
         }
         [HttpPost]
         [ProducesResponseType(typeof(JsonView), StatusCodes.Status200OK)]

OASystem/OASystem.Infrastructure/Repositories/Groups/DelegationInfoRepository.cs

@@ -105,7 +105,7 @@ namespace OASystem.Infrastructure.Repositories.Groups
             Result result = new Result() { Code = -2, Msg = "未知错误", Data = new List<object>() { } };
 
             string sql = string.Format(@"Select Id,TeamName,TourCode,ClientName,VisitCountry,VisitStartDate,VisitEndDate,VisitDays,VisitPNumber 
-                                             From Grp_DelegationInfo Where IsDel = 0 Order By Id Desc");
+                                             From Grp_DelegationInfo With(NoLock) Where IsDel = 0 Order By Id Desc");
 
 
             var _DelegationInfo = await _sqlSugar.SqlQueryable<Web_ShareGroupInfoView>(sql).ToListAsync();