feat:bug fixed

New_College.Api/Controllers/OAuthController.cs

@@ -64,6 +64,19 @@ namespace New_College.Controllers
             {
                 if (user.Item1)
                 {
+                    if (string.IsNullOrEmpty(user.Item2.NickName))
+                    {
+                        var single = await _CustomerInfoServices.QueryById(user.Item2.Id);
+                        if (!string.IsNullOrWhiteSpace(user.Item2.Phone))
+                        {
+                            single.NickName= user.Item2.Phone;
+                        }
+                        if (!string.IsNullOrWhiteSpace(user.Item2.UserCode))
+                        {
+                            single.NickName = user.Item2.UserCode; 
+                        }
+                        await _CustomerInfoServices.Update(single);
+                    }
                     TokenModelJwt tokenModel = new TokenModelJwt { Uid = user.Item2.Id, Role = "users" };
                     jwtStr = JwtHelper.IssueJwt(tokenModel);
                     response.token = jwtStr;

New_College.Api/appsettings.Development.json

@@ -212,8 +212,8 @@
     "OrganizationName": "六纬生涯",
     "ApplicationName": "六纬生涯",
     "ApplicationType": "webapi",
-    "ClientId": "4c6d761417dbbdd665be",
+    "ClientId": "776d639918192c449537",
-    "ClientSecret": "cc385a5d0efd5f7bf693d8c4574126158f7b0a8f",
+    "ClientSecret": "d556f0692052a2df56614282dd86895b04783262",
     "CallbackPath": "http://test.sso.ycymedu.com/login/oauth/authorize?client_id=4c6d761417dbbdd665be&response_type=code&redirect_uri=http://192.168.100.129:8081/Home/FirstPage&scope=read&state=casdoor",
     "RequireHttpsMetadata": false
   },

New_College.Api/appsettings.json

@@ -212,8 +212,8 @@
     "OrganizationName": "六纬生涯",
     "ApplicationName": "六纬生涯",
     "ApplicationType": "webapi",
-    "ClientId": "776d639918192c449537",
+    "ClientId": "4c6d761417dbbdd665be",
-    "ClientSecret": "d556f0692052a2df56614282dd86895b04783262",
+    "ClientSecret": "cc385a5d0efd5f7bf693d8c4574126158f7b0a8f",
     "CallbackPath": "http://192.168.103.119:8000/login/oauth/authorize?client_id=ae6bdccc3a7821232b31&response_type=code&redirect_uri=http://192.168.103.100:8083/callback&scope=read&state=casdoor",
     "RequireHttpsMetadata": false
   },

New_College.Model/ViewModels/Query/OneSubmitGoRequest.cs

@@ -219,6 +219,8 @@ namespace New_College.Model.ViewModels
         /// </summary>
         public string Major { get; set; }
 
+        public string AcademicYear { get; set; }
+
         /// <summary>
         /// 专业备注
         /// </summary>

New_College.Services/D_PlanMajorDescServices.cs

@@ -185,7 +185,7 @@ namespace New_College.Services
                   .AndIF(request._211.HasValue && request._211 == 1, c => c._211 == "是")
                   .AndIF(request._985.HasValue && request._985 == 1, c => c._985 == "是")
                   .AndIF(!string.IsNullOrWhiteSpace(request.Ownership), c => c.Ownership == request.Ownership)
-                   .AndIF(request.Nature!=null && request.Nature.Count() > 0, c => SqlFunc.ContainsArray(Nature, request.Nature))
+                   .AndIF(request.Nature != null && request.Nature.Count() > 0, c => SqlFunc.ContainsArray(Nature, request.Nature))
                  .ToExpression();
             //var query = await _qualificationLineRepository.QueryPage(expression, request.PageIndex, request.PageSize, "  LowScoreRank desc ");
             var query = await _qualificationLineRepository.QueryPage(expression, request.PageIndex, request.PageSize, "  LowScoreRank desc ");
@@ -253,6 +253,7 @@ namespace New_College.Services
                     Major = t.MajorName,
                     // MajorGroup = t.MajorGroup,//山东无专业组
                     MajorRemark = t.Remark,
+                    AcademicYear = t.AcademicYear,
                     planCount = int.Parse(t._23Count),
                     SubjectClam = t._23subject,
                     Type = MajorPlanScoreTool.GetPlanScore(int.Parse(t._23Score), request.Score),//冲稳保院校

New_College.Services/T_EnrollmentPlanedescServices.cs

@@ -1221,8 +1221,10 @@ namespace New_College.Services
             var descinfo = await t_TbSNeedDataInfoRepository.Query(x => PlanIds.Contains(x.ID));     
             var universityids = query.details.Select(x => x.UniversityId).ToList();
             var universityinfo = await d_UniversityRepository.Query(x => universityids.Contains(x.Id) && x.IsDelete == false, "Rank asc");
+            int sort = 0;
             foreach (var item in query.details)
             {
+
                 if (item.PlanMagorIds != null && item.PlanMagorIds.Count() > 0)
                 {
 
@@ -1250,11 +1252,12 @@ namespace New_College.Services
                     }
                     else
                     {
+                        sort++;
                         list.Add(new SimuVolunteerTableResult()
                         {
                             Logo = nowuniversityinfo.Logo,
                             Nhef = nowuniversityinfo.Nhef > 0,
-                            Rank = nowuniversityinfo.Rank,
+                            Rank = sort,
                             Sff = nowuniversityinfo.Sff > 0,
                             Syl = nowuniversityinfo.Syl > 0,
                             UniversityId = item.UniversityId,

New_College.Services/V_CustomerInfoServices.cs

@@ -401,7 +401,7 @@ namespace New_College.Services
 
         public async Task<Tuple<bool, CustomerInfoResult>> GetUserInfo(LoginQuery query)
         {
-            var userinfo = (await _dal.Query(w => w.OpenId == query.openId)).ToList().First();
+            var userinfo = (await _dal.Query(w => w.OpenId == query.openId && w.IsDelete == false)).ToList().First();
             if (userinfo != null)
             {
                 return new Tuple<bool, CustomerInfoResult>(true, new CustomerInfoResult()