Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/FillinFrom/FillinFromService.cs

@@ -78,13 +78,13 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration
                     dp.Add("IsFlag", queryParam["IsFlag"].ToString(), DbType.String);
                     strSql.Append(" AND t.IsFlag = @IsFlag ");
                 }
-                if (!queryParam["userId"].IsEmpty() && !queryParam["isSystem"].ToBool() && !queryParam["departmentId"].IsEmpty())
+                if (queryParam["isSystem"].ToBool() == false)
                 {
-                    if (queryParam["isSystem"].ToBool() == false)
+                    if (!queryParam["departmentId"].IsEmpty())
                     {
-
+                        dp.Add("FillingDept", queryParam["departmentId"].ToString(), DbType.String);
+                        strSql.Append(" AND t.FillingDept = @FillingDept ");
                     }
-                    //queryParam["userId"].ToString() != "System" &&
                 }
                 return this.BaseRepository("CollegeMIS").FindList<FillinFromEntity>(strSql.ToString(), dp, pagination);
             }