Browse Source

Merge branch 'develop' of http://132.232.92.186:3000/XinXiBu/OA2023 into develop

LEIYI 3 months ago
parent
commit
d5f90737a3
1 changed files with 3 additions and 2 deletions
  1. 3 2
      OASystem/OASystem.Api/Controllers/PersonnelModuleController.cs

+ 3 - 2
OASystem/OASystem.Api/Controllers/PersonnelModuleController.cs

@@ -2058,7 +2058,7 @@ namespace OASystem.API.Controllers
         {
             var jw = JsonView(false);
 
-            string sql_CTE = @"-- 定义递归查询的CTE
+            string sql_CTE = $@"-- 定义递归查询的CTE
 WITH PerAssessmentSettingsCTE AS (
     -- 选择指定ID的记录作为起点
     SELECT
@@ -2078,7 +2078,7 @@ WITH PerAssessmentSettingsCTE AS (
     	pac.id = pacs.assessmentSettingid AND  pacs.isdel = 0
     	
     WHERE
-        pacs.userid = 302
+        pacs.userid = {userid}
 	AND  
 		pac.isdel = 0
         
@@ -2271,6 +2271,7 @@ OPTION (MAXRECURSION 0); -- 允许无限递归      ";
 
             RefAsync<int> total = 0;//REF和OUT不支持异步,想要真的异步这是最优解
             var entities = await _sqlSugar.Queryable<Per_AssessmentSetting>()
+                                 .Where(x=>x.IsDel == 0)
                                  .WhereIF(!string.IsNullOrEmpty(dto.SearchValue), e => e.Name.Contains(dto.SearchValue))       
                                  .ToPageListAsync(dto.pageIndex, dto.pageSize, total);