提交代码

Edu.Model/ViewModel/OKR/OKRPersonalDimension.cs

@@ -31,6 +31,8 @@ namespace Edu.Model.ViewModel.OKR
         /// </summary>
         public int Dept_Id { get; set; }
 
+        public string QDeptIds { get; set; }
+
 
         /// <summary>
         /// 员工部门

Edu.Repository/OKR/RB_OKR_ObjectiveRepository.cs

@@ -363,7 +363,7 @@ GROUP BY a.CreateBy";
         /// <param name="periodId"></param>
         /// <param name="id"></param>
         /// <returns></returns>
-        public List<RB_OKR_Objective_ViewModel> GetOKRPersonalRelationAlignList(int group_Id, int periodId, string CreateBys,int  id)
+        public List<RB_OKR_Objective_ViewModel> GetOKRPersonalRelationAlignList(int group_Id, int periodId, string CreateBys, int id)
         {
             string sql = $@"SELECT COUNT(0) as ChildNum,o2.CreateBy FROM 
 rb_okr_objectiverelation or1
@@ -415,6 +415,10 @@ WHERE o1.CreateBy in({CreateBys})  and o2.CreateBy ={id} and o1.`Status`=2 and
                 {
                     whereperiodId.AppendFormat(" AND a.{0}={1} ", nameof(OKRPersonalDimension.PeriodId), query.PeriodId);
                 }
+                if (!string.IsNullOrWhiteSpace(query.Dept_Ids))
+                {
+                    where.AppendFormat(" AND B.{0} in ({1}) ", nameof(OKRPersonalDimension.Dept_Id), query.Dept_Ids);
+                }
                 //if (!string.IsNullOrEmpty(query.StartEntryTime))
                 //{
                 //    where.AppendFormat(" AND b.{0}>='{1}' ", nameof(Employee_ViewModel.EntryTime), query.StartEntryTime);
@@ -494,7 +498,7 @@ WHERE  1=1 {5}
         {
             DynamicParameters parameters = new DynamicParameters();
             string sql = GetEmployeeSqlReposiroty(query, parameters);
-            var list = Get<OKRPersonalDimension>( sql, parameters).ToList();
+            var list = Get<OKRPersonalDimension>(sql, parameters).ToList();
             return list;
         }
 

Edu.WebApi/Controllers/OKR/OKRPeriodController.cs

@@ -1883,7 +1883,9 @@ namespace Edu.WebApi.Controllers.OKR
             {
 
                 School_Id = base.ParmJObj.GetInt("School_Id"),
-                PeriodId = base.ParmJObj.GetInt("PeriodId", 0)
+
+                PeriodId = base.ParmJObj.GetInt("PeriodId", 0),
+                QDeptIds = base.ParmJObj.GetStringValue("QDeptIds"),
             };
 
             query.Group_Id = base.UserInfo.Group_Id;