稽查配置数据整理

IRaCIS.Core.Application/Service/Inspection/FrontAuditConfigService.cs

@@ -336,12 +336,12 @@ namespace IRaCIS.Core.Application.Service
                 //后续移除   避免前端看到的不统一  因为采用了新的关联方式，之前数据在Data里面取   现在配置在CommonData 里取 
 
                 var dataDic = JsonConvert.DeserializeObject<IDictionary<string, object>>(str);
-                var commonDic= JsonConvert.DeserializeObject<IDictionary<string, object>>(str2);
+                var commonDic = JsonConvert.DeserializeObject<IDictionary<string, object>>(str2);
                 foreach (var valuePair in dataDic)
                 {
                     if (!commonDic.ContainsKey(valuePair.Key))
                     {
-                        commonDic.Add(valuePair.Key, valuePair.Value);  
+                        commonDic.Add(valuePair.Key, valuePair.Value);
                     }
                 }
 
@@ -1011,8 +1011,8 @@ namespace IRaCIS.Core.Application.Service
         [HttpGet]
         public async Task<List<string>> GetModuleTypeDescriptionList(Guid moduleTypeId)
         {
-            var result = await _frontAuditConfigRepository.Where(x => x.ModuleTypeId == moduleTypeId && x.Description != string.Empty).Select(x => x.Description).Distinct().ToListAsync();
-            return result;
+            var result = await _frontAuditConfigRepository.Where(x => x.ModuleTypeId == moduleTypeId && x.ObjectTypeId != null && x.OptTypeId != null && x.Description.Length>0).Select(x => new { x.Description,x.Sort } ).OrderBy(t=>t.Sort).ToListAsync();
+            return result.Select(t=>t.Description).Distinct().ToList();
         }
 
         /// <summary>
@@ -1133,6 +1133,11 @@ namespace IRaCIS.Core.Application.Service
                 return ResponseOutput.NotOk("名称重复");
             }
 
+            if (addOrEditFrontAuditConfig.ConfigType == "C")
+            {
+                addOrEditFrontAuditConfig.Description = "";
+            }
+
             var entity = await _frontAuditConfigRepository.InsertOrUpdateAsync(addOrEditFrontAuditConfig, true);
 
             return ResponseOutput.Ok(entity.Id.ToString());