Merge branch '长阳分支中职' of http://123.57.209.16:3000/bjquanjiang/DigitalScholl into 长阳分支中职

Learun.Framework.Ultimate V7/Learun.Application.Web/Views/UserCenter/IndexInTeacher.cshtml

@@ -496,12 +496,15 @@
 
                                 },
                                 date: function (value) {
-                                    var date = new Date(value);
-                                    if (date instanceof Date && !isNaN(date.getTime())) {
-                                        return date.toLocaleDateString();
-                                    } else {
+                                    if (!!value) {
+                                        var date = new Date(value);
+                                        if (date instanceof Date && !isNaN(date.getTime())) {
+                                            return date.toLocaleDateString();
+                                        } else {
+                                            return '';
+                                        }
+                                    } else
                                         return '';
-                                    }
                                 },
                                 company: function (value) {
                                     var result;

Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/EducationalAdministration/LeaveSchool/LeaveSchoolService.cs

@@ -31,7 +31,7 @@ namespace Learun.Application.TwoDevelopment.EducationalAdministration
                 var strSql = new StringBuilder();
                 strSql.Append("SELECT  ");
                 strSql.Append(@" t.f_itemname,  t.pcum ");
-                strSql.Append(@"  FROM (select F_ItemName,count(id) as pcum from LeaveSchool aa left join  (select a.F_ItemName,a.F_ItemValue from LR_Base_DataItemDetail a left join LR_Base_DataItem b on a.F_ItemId=b.F_ItemId where b.F_ItemCode='LeaveType' ) bb on F_leixing=F_ItemValue group by F_ItemName)t ");
+                strSql.Append(@"  FROM (select F_ItemName,count(slid) as pcum from studentleave aa left join  (select a.F_ItemName,a.F_ItemValue from LR_Base_DataItemDetail a left join LR_Base_DataItem b on a.F_ItemId=b.F_ItemId where b.F_ItemCode='LeaveType' ) bb on F_qjtype=F_ItemValue group by F_ItemName)t ");
                 strSql.Append("  WHERE 1=1 ");
                 var queryParam = queryJson.ToJObject();
                 // 虚拟参数