Merge branch 'develop' of http://18t7i08736.yicp.fun:10018/Coder/24Hour.Service into develop

24Hour/Controllers/Common/LawyerArchivesController.cs

@@ -107,6 +107,43 @@ namespace _24Hour.Controllers.Common
             return res;
         }
         /// <summary>
+        /// 修改律师事务所统一信用代码
+        /// </summary>
+        /// <param name="lawyerid"></param>
+        /// <param name="sccCode"></param>
+        /// <returns></returns>
+        [HttpGet("ChangeSccCodeByLawyer")]
+        public async Task<Result> ChangeSccCodeByLawyer(string lawyerid, string sccCode)
+        {
+            var lawyer = await _db.Queryable<App_Sys_UserModel>().Where(x => x.Id == lawyerid).FirstAsync();
+            if (lawyer == null)
+            {
+                return Result.Error("数据不存在");
+            }
+            else
+            {
+                if (lawyer.departmentUnifiedSocialCreditCode == sccCode)
+                {
+                    return Result.Success("数据无需修改");
+                }
+                else
+                {
+                    lawyer.departmentUnifiedSocialCreditCode = sccCode;
+
+                    var num = await _db.Updateable(lawyer).UpdateColumns(x => x.departmentUnifiedSocialCreditCode).ExecuteCommandAsync();
+                    if (num>0)
+                    {
+                        return Result.Success("更新成功");
+                    }
+                    else
+                    {
+                        return Result.Error("更新失败");
+                    }
+                }
+
+            }
+        }
+        /// <summary>
         /// 修改内网律师信息
         /// </summary>
         /// <param name="input"></param>
@@ -129,7 +166,6 @@ namespace _24Hour.Controllers.Common
                     {
                         result.IsSucceed = true;
                         result.result = "修改成功";
-
                     }
                 }
                 else
@@ -216,6 +252,7 @@ namespace _24Hour.Controllers.Common
                                 {
                                     item.name = lawyerinfo.name;
                                     item.sex = lawyerinfo.sex;
+                                    item.identity = "律师";
                                     item.phone = lawyerinfo.phone;
                                     item.departmentName = lawyerinfo.departmentName;
                                     item.cardId = lawyerinfo.cardId;
@@ -2162,7 +2199,7 @@ namespace _24Hour.Controllers.Common
                         }
                         else
                         {
-                            if (item?.cardId.Length>=18)
+                            if (item?.cardId.Length >= 18)
                             {
                                 var sexdd = StringExtension.GetGenderByIdCard(item?.cardId);
                                 if (sexdd)
@@ -2181,7 +2218,7 @@ namespace _24Hour.Controllers.Common
                             editentity.phone = item.phone;
                             editentity.departmentName = item.departmentName;
                             editentity.identitycardId = item.identitycardId;
-                            editentity.identity = item.identitycardId;
+                            editentity.identity = "律师";
                             editentity.usertype = 1;
                             editentity.audit = 0;
                             editentity.isdeactivate = 0;

24Hour/build/dockerbuild.txt

@@ -30,14 +30,14 @@ docker run \
 
 docker load -i twentyfoursvc1019.tar
 
-docker run --name twentyfoursvc1.0.1.27 \
+docker run --name twentyfoursvc1.0.2.2 \
 -p 8098:8098 \
 -v /home/24hour/config/appsettings.json:/app/appsettings.json \
 -v /home/24hour/config/log4net.config:/app/log4net.config \
 -v /home/24hour/wwwroot:/app/wwwroot \
 -v /home/24hour/logs:/app/logs \
 -v /etc/localtime:/etc/localtime \
---restart=always -d twentyfoursvc:1.0.1.27
+--restart=always -d twentyfoursvc:1.0.2.2