Merge branch 'develop' of http://132.232.92.186:3000/XinXiBu/OA2023 into develop

OASystem/OASystem.Api/Controllers/GroupsController.cs

@@ -2306,6 +2306,9 @@ FROM
                 }
             }
 
+
+            di.VisitCountry = Regex.Replace(di.VisitCountry, @"[|-]", "、");
+
             var bookMarkDic = new Dictionary<string, string>
             {
                 { "ClientUnit", di.ClientUnit },
@@ -27270,7 +27273,7 @@ ORDER BY
 
             var groups = await query
                 .OrderByDescending((x, y) => y.VisitDate)
-                .Select((x, y) => new 
+                .Select((x, y) => new
                 {
                     y.Id,
                     GroupName = y.TeamName,
@@ -27305,7 +27308,7 @@ ORDER BY
         /// </summary>
         /// <returns></returns>
         [HttpPost]
-        public async Task<IActionResult> VisaProcessAdd(int groupId,int currUserId)
+        public async Task<IActionResult> VisaProcessAdd(int groupId, int currUserId)
         {
             return Ok(await _visaProcessRep.Create(currUserId, groupId));
         }
@@ -27330,7 +27333,7 @@ ORDER BY
         {
             //参数验证
             var stepValid = await _sqlSugar.Queryable<Grp_VisaProcessSteps>().Where(x => x.Id == id && x.IsDel == 0).AnyAsync();
-            if (!stepValid) return Ok(JsonView(false,"签证流程ID无效。"));
+            if (!stepValid) return Ok(JsonView(false, "签证流程ID无效。"));
 
             var userValid = await _sqlSugar.Queryable<Sys_Users>().Where(x => x.Id == currUserId && x.IsDel == 0).AnyAsync();
             if (!userValid) return Ok(JsonView(false, "用户ID无效。"));
@@ -27366,12 +27369,12 @@ ORDER BY
             else stepVal = dto.StepContents[0].ToString();
 
             var stepInfo = new Grp_VisaProcessSteps
-                {
-                    Id = dto.StepId,
-                    DataType = stepValid.DataType,
-                    TypedValue = stepVal,
-                    LastUpdateUserId = dto.CurrUserId
-                };
+            {
+                Id = dto.StepId,
+                DataType = stepValid.DataType,
+                TypedValue = stepVal,
+                LastUpdateUserId = dto.CurrUserId
+            };
 
             var res = await _visaProcessRep.Update(stepInfo);
 
@@ -27398,7 +27401,7 @@ ORDER BY
             if (dto.Files == null || dto.Files.Count < 1) return Ok(JsonView(false, "请选择文件。"));
 
             //验证该步骤是否可以上传文件
-            var uploadSteps = new List<int>() { 
+            var uploadSteps = new List<int>() {
                 5, //实际出签时间
                 6, //是否需要开出境证明
                 7, //是否需要办理电子入境卡手续
@@ -27466,7 +27469,7 @@ ORDER BY
                 .Where(s => s.Id == dto.StepId && s.IsDel == 0)
                 .ExecuteCommandAsync();
 
-            if (res < 1) Ok(JsonView(false,"文件上传失败。"));
+            if (res < 1) Ok(JsonView(false, "文件上传失败。"));
 
             return Ok(JsonView(true));
         }