Merge branch 'master' of http://10.172.30.12:3000/Coder/24Hour.Service

24Hour/24Hour.csproj.user

@@ -3,6 +3,6 @@
   <PropertyGroup>
     <Controller_SelectedScaffolderID>MvcControllerEmptyScaffolder</Controller_SelectedScaffolderID>
     <Controller_SelectedScaffolderCategoryPath>root/Common/MVC/Controller</Controller_SelectedScaffolderCategoryPath>
-    <NameOfLastUsedPublishProfile>E:\Code\24Hour.Service\24Hour\Properties\PublishProfiles\FolderProfile.pubxml</NameOfLastUsedPublishProfile>
+    <NameOfLastUsedPublishProfile>E:\24Hour.Service\24Hour\Properties\PublishProfiles\FolderProfile.pubxml</NameOfLastUsedPublishProfile>
   </PropertyGroup>
 </Project>

24Hour/Controllers/LoginController.cs

@@ -142,6 +142,13 @@ namespace _24Hour.Controllers
             try
             {
                 var Passmd5 = Md5.Encrypt32(login.Password).ToLower();
+                var model = await _db.Queryable<App_Sys_UserModel>().Where(x => x.phone== login.phone  && x.IsDeleted==0).FirstAsync();
+                if (model == null)
+                {
+                    ret.IsSucceed = false;
+                    ret.Message = "账号不存在，请先注册！";
+                    return ret;
+                }
                 var date = await _db.Queryable<App_Sys_UserModel>().Where(q => q.IsDeleted == 0 && q.isdeactivate == 0 && q.phone == login.phone && q.Password == Passmd5).FirstAsync();
                 if (date != null)
                 {
@@ -197,7 +204,7 @@ namespace _24Hour.Controllers
                         phone = date.phone,
                         photo = date.photo,
                         duties = date.duties,
-                        identity=date.identity,
+                        identity = date.identity,
                         usertype = date.usertype,
                         unitCode = date.unitCode,
                         department = "",
@@ -371,25 +378,25 @@ namespace _24Hour.Controllers
 
         [HttpGet]
         [Route("cardIdLogin")]
-        public async Task<Result> cardIdLogin(string cardId,string name)
+        public async Task<Result> cardIdLogin(string cardId, string name)
         {
             var date = await _db.Queryable<App_Sys_UserModel>().Where(q => q.IsDeleted == 0 && q.isdeactivate == 0 && q.cardId == cardId).FirstAsync();
             if (date != null)
             {
-               //if (date.usertype == 1 && date.audit == null)
-               // {
-               //     ret.IsSucceed = false;
-               //     ret.Message = "用户审核中！";
-               //     return ret;
-               // }
-               // else if (date.usertype == 1 && date.audit == 1)
-               // {
-               //     ret.IsSucceed = false;
-               //     ret.Message = $"用户审核未通过，原因：{date.describe}！";
-               //     return ret;
-               // }
-               // else
-               if (date.usertype == 0 && date.becurrent == 1)
+                //if (date.usertype == 1 && date.audit == null)
+                // {
+                //     ret.IsSucceed = false;
+                //     ret.Message = "用户审核中！";
+                //     return ret;
+                // }
+                // else if (date.usertype == 1 && date.audit == 1)
+                // {
+                //     ret.IsSucceed = false;
+                //     ret.Message = $"用户审核未通过，原因：{date.describe}！";
+                //     return ret;
+                // }
+                // else
+                if (date.usertype == 0 && date.becurrent == 1)
                 {
                     ret.IsSucceed = false;
                     ret.Message = $"用户未授权无法登录，请联系管理员！";

24Hour/Properties/PublishProfiles/FolderProfile.pubxml

@@ -10,7 +10,7 @@ https://go.microsoft.com/fwlink/?LinkID=208121.
     <LastUsedBuildConfiguration>Release</LastUsedBuildConfiguration>
     <LastUsedPlatform>Any CPU</LastUsedPlatform>
     <PublishProvider>FileSystem</PublishProvider>
-    <PublishUrl>C:\Users\Administrator\Desktop\新建文件夹 (4)</PublishUrl>
+    <PublishUrl>D:\24小时发布</PublishUrl>
     <WebPublishMethod>FileSystem</WebPublishMethod>
     <_TargetId>Folder</_TargetId>
     <SiteUrlToLaunchAfterPublish />

24Hour/Properties/PublishProfiles/FolderProfile.pubxml.user

@@ -4,8 +4,8 @@ https://go.microsoft.com/fwlink/?LinkID=208121.
 -->
 <Project>
   <PropertyGroup>
-    <_PublishTargetUrl>C:\Users\Administrator\Desktop\新建文件夹 (4)</_PublishTargetUrl>
-    <History>True|2023-06-27T10:06:12.3724487Z;True|2023-06-27T17:22:11.4211972+08:00;True|2023-06-27T15:48:34.1728433+08:00;True|2023-06-13T18:05:11.2568840+08:00;False|2023-06-13T18:04:56.9546003+08:00;</History>
+    <_PublishTargetUrl>D:\24小时发布</_PublishTargetUrl>
+    <History>True|2023-06-29T08:07:09.3334291Z;True|2023-06-29T15:56:52.9510718+08:00;True|2023-06-29T15:49:16.8161173+08:00;True|2023-06-27T18:06:12.3724487+08:00;True|2023-06-27T17:22:11.4211972+08:00;True|2023-06-27T15:48:34.1728433+08:00;True|2023-06-13T18:05:11.2568840+08:00;False|2023-06-13T18:04:56.9546003+08:00;</History>
     <LastFailureDetails />
   </PropertyGroup>
 </Project>