提交代码

Edu.Repository/User/RB_AccountRepository.cs

@@ -272,11 +272,11 @@ FROM
                 }
                 if (!string.IsNullOrEmpty(query.StartBirthDate))
                 {
-                    where.AppendFormat($@"AND STR_TO_DATE(CONCAT(DATE_FORMAT(now(),'%Y'),'-',DATE_FORMAT(b.BirthDate,'%m-%d')), '%Y-%m-%d') >= STR_TO_DATE(CONCAT(DATE_FORMAT(now(),'%Y'),'-','{query.StartBirthDate}') , '%Y-%m-%d') ");
+                    where.AppendFormat($@" AND STR_TO_DATE(CONCAT(DATE_FORMAT(now(),'%Y'),'-',DATE_FORMAT(b.BirthDate,'%m-%d')), '%Y-%m-%d') >= DATE_FORMAT('{query.StartBirthDate}' , '%Y-%m-%d') ");
                 }
                 if (!string.IsNullOrEmpty(query.EndBirthDate))
                 {
-                    where.AppendFormat($@" AND (CONCAT(DATE_FORMAT(now(),'%Y'),'-',DATE_FORMAT(b.BirthDate,'%m-%d')), '%Y-%m-%d') <= STR_TO_DATE(CONCAT(DATE_FORMAT(now(),'%Y'),'-','{query.EndBirthDate}') , '%Y-%m-%d') ");
+                    where.AppendFormat($@" AND STR_TO_DATE( CONCAT(DATE_FORMAT(now(),'%Y'),'-',DATE_FORMAT(b.BirthDate,'%m-%d')), '%Y-%m-%d') <= DATE_FORMAT('{query.EndBirthDate}' , '%Y-%m-%d') ");
                 }
                 //if (!string.IsNullOrEmpty(query.StartBirthDate) && !string.IsNullOrEmpty(query.EndBirthDate))
                 //{
@@ -296,7 +296,7 @@ SELECT A.Id,A.Account,A.AccountId,A.Group_Id,A.School_Id,A.EmployeeName,A.UserIc
       ,(CASE  WHEN CONCAT(DATE_FORMAT(now(),'%Y'),'-',DATE_FORMAT(BirthDate,'%m-%d')) >= DATE_FORMAT(now(),'%Y-%m-%d')  
                AND CONCAT(DATE_FORMAT(now(),'%Y'),'-',DATE_FORMAT(BirthDate,'%m-%d')) <= DATE_FORMAT(date_add(now(),INTERVAL 6 DAY),'%Y-%m-%d')
               THEN 1
-        ELSE 0 END) IsBirth
+        ELSE 0 END) IsBirth  
 FROM 
 (
 		SELECT A.*,IFNULL(B.MName,'') AS EmployeeName,B.MHead AS UserIcon,B.Dept_Id,B.Post_Id,B.IDCard,B.Sex,B.Education,B.EntryTime,B.Address,B.BirthDate
@@ -316,8 +316,8 @@ FROM
 ) AS A LEFT JOIN rb_group AS g ON A.Group_Id=g.GId
        LEFT JOIN rb_school AS s ON A.School_Id=s.SId
        LEFT JOIN rb_department AS d ON A.Dept_Id=d.DeptId
-       LEFT JOIN rb_post AS p ON A.Post_Id=p.PostId
-WHERE 1=1 {1}
+       LEFT JOIN rb_post AS p ON A.Post_Id=p.PostId    
+WHERE  1=1   {1}
 ", where.ToString(), where2.ToString());
             return builder.ToString();
         }