From 560b2e1dd596db88ee9393d773473f7c02793e55 Mon Sep 17 00:00:00 2001 From: zhangli <1109134334@qq.com> Date: Wed, 29 Jun 2022 16:27:01 +0800 Subject: [PATCH] =?UTF-8?q?=E5=AD=A6=E7=94=9F=E5=AE=BF=E8=88=8D=E7=AE=A1?= =?UTF-8?q?=E7=90=86=E5=AF=BC=E5=85=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Accommodation/AccommodationService.cs | 33 +++++++++---------- 1 file changed, 16 insertions(+), 17 deletions(-) diff --git a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/LogisticsManagement/Accommodation/AccommodationService.cs b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/LogisticsManagement/Accommodation/AccommodationService.cs index 69fd1768c..3749ff438 100644 --- a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/LogisticsManagement/Accommodation/AccommodationService.cs +++ b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/LogisticsManagement/Accommodation/AccommodationService.cs @@ -1959,8 +1959,7 @@ where ID='{ParentID}' var DeptNo = deptList.Where(x => x.DeptName == dr["系部"].ToString().Trim()).FirstOrDefault()?.DeptNo; var MajorNo = majorList.Where(x => x.MajorName == dr["专业"].ToString().Trim() && x.DeptNo == DeptNo) .FirstOrDefault()?.MajorNo; - var ClassNo = classList.Where(x => - x.ClassName == dr["班级"].ToString() && x.DeptNo == DeptNo && x.MajorNo == MajorNo).FirstOrDefault()?.ClassNo; + var ClassNo = classList.Where(x => x.ClassName == dr["班级"].ToString()).FirstOrDefault()?.ClassNo; if (string.IsNullOrEmpty(DeptNo)) { fnum++; @@ -1984,21 +1983,21 @@ where ID='{ParentID}' } var leaderno = stuinfobasic.Where(x => x.StuNo == dr["舍长学号"].ToString() && x.ClassNo == ClassNo).FirstOrDefault()?.StuNo; var stuno = stuinfobasic.Where(x => x.StuNo == dr["学生学号"].ToString() && x.ClassNo == ClassNo).FirstOrDefault()?.StuNo; - if (string.IsNullOrEmpty(stuno)) - { - fnum++; - dr["导入错误"] = dr["学生学号"] + "导入错误"; - failDt.Rows.Add(dr.ItemArray); - continue; - } - if (string.IsNullOrEmpty(leaderno)) - { - fnum++; - dr["导入错误"] = dr["舍长学号"] + "导入错误"; - failDt.Rows.Add(dr.ItemArray); - continue; - } - + //if (string.IsNullOrEmpty(stuno)) + //{ + // fnum++; + // dr["导入错误"] = dr["学生学号"] + "导入错误"; + // failDt.Rows.Add(dr.ItemArray); + // continue; + //} + //if (string.IsNullOrEmpty(leaderno)) + //{ + // fnum++; + // dr["导入错误"] = dr["舍长学号"] + "导入错误"; + // failDt.Rows.Add(dr.ItemArray); + // continue; + //} + var parent = dormitoryBuildList.Where(x => x.Name == "数字化智慧校园").FirstOrDefault(); if (parent == null) {