修改律师阅卷从2.0系统解析数据的方法

24Hour/Controllers/Common/LawyerArchivesController.cs

@@ -374,26 +374,30 @@ namespace _24Hour.Controllers.Common
             if (reponse.IsSucceed == true)
             {
                 var a = reponse.result;
-                var data = new[]
+                var datd = new
+                {
+                    id = a.Id,
+                    lable = a.jzmc,
+                    children = a.jzml.Where(x => x.fmlbh == null).OrderBy(x => x.mlsxh).Select(x => new
                     {
-                     new {
+                        id = x.Id,
-                              id = a.jzbh,
+                        lable = x.mlxsmc,
-                              lable = a.jzmc,
+                        children = a.jzml.Where(q => q.fmlbh == x.mlbh).OrderBy(q => q.mlsxh).Select(q => new
-                              children = a?.jzml?.OrderBy(x=>x.mlsxh).Select(x => new
+                        {
-                              {
+                            id = q.Id,
-                                  id = x.mlbh,
+                            lable = q.mlxsmc,
-                                  lable = x.mlxsmc,
+                            children = q.jzwj.OrderBy(e => e.wjsxh).Select(e => new
-                                  children = x.jzwj.OrderBy(x=>x.wjsxh).Select(q => new
+                            {
-                                  {
+                                id = e.wjxh,
-                                      id = q.wjxh,
+                                lable = e.wjxsmc,
-                                      lable = q.wjxsmc,
+                                filepath = e.jpgwjlj
-                                      filepath = q.jpgwjlj
+                            })
-                                  })
+                        })
-                              })
+                    })
-                          }
+                };
-                      };
+
                 result.IsSucceed = true;
-                result.result = data;
+                result.result = datd;
             }
             else
             {
@@ -415,52 +419,33 @@ namespace _24Hour.Controllers.Common
                    .Includes(x => x.jzml.OrderBy(x => x.mlsxh).ToList())
                    .Includes(x => x.jzml, x => x.jzwj.OrderBy(x => x.wjsxh).ToList())
                    .FirstAsync(x => x.Id == jzid);
-            if (list!=null)
+            if (list != null)
             {
                 var a = mapper.Map<JZJBXXDto>(list);
-
                 var datd = new
                 {
                     id = a.Id,
                     lable = a.jzmc,
                     children = a.jzml.Where(x => x.fmlbh == null).OrderBy(x => x.mlsxh).Select(x => new
                     {
-                        id=x.Id,
+                        id = x.mlbh,
-                        lable=x.mlxsmc,
+                        lable = x.mlxsmc,
-                        children = a.jzml.Where(q => q.fmlbh == x.mlbh).OrderBy(q => q.mlsxh).Select(q =>new
+                        children = a.jzml.Where(q => q.fmlbh == x.mlbh).OrderBy(q => q.mlsxh).Select(q => new
                         {
-                            id=q.Id,
+                            id = q.mlbh,
-                            lable=q.mlxsmc,
+                            lable = q.mlxsmc,
                             children = q.jzwj.OrderBy(e => e.wjsxh).Select(e => new
                             {
-                                id=e.Id,
+                                id = e.wjxh,
-                                lable=e.wjxsmc,
+                                lable = e.wjxsmc,
                                 filepath = e.jpgwjlj
                             })
                         })
                     })
                 };
 
-                var data = new[]
-                       {
-                     new {
-                              id = a.jzbh,
-                              lable = a.jzmc,
-                              children = a?.jzml?.OrderBy(x=>x.mlsxh).Select(x => new
-                              {
-                                  id = x.mlbh,
-                                  lable = x.mlxsmc,
-                                  children = x.jzwj.OrderBy(x=>x.wjsxh).Select(q => new
-                                  {
-                                      id = q.wjxh,
-                                      lable = q.wjxsmc,
-                                      filepath = q.jpgwjlj
-                                  })
-                              })
-                          }
-                      };
                 result.IsSucceed = true;
-                result.result = data;
+                result.result = datd;
             }
             else
             {
@@ -498,8 +483,13 @@ namespace _24Hour.Controllers.Common
                     }
                     //再排除没有文件的目录信息
                     //这样筛选后获取的数据就可以保证不会出现空子节点的父节点
-                    dto.jzml = dto.jzml.Where(x => x.jzwj.Any()).ToList();
+                    //dto.jzml = dto.jzml.Where(x => x.jzwj.Any() || x.fmlbh == null).ToList();
+                    //var fml = dto.jzml.Where(x => x.fmlbh == null);
+
+                    var hasfileslist = dto.jzml.Where(x => x.jzwj.Any()).ToList();
+                    var fmllist = dto.jzml.Where(x => string.IsNullOrEmpty(x.fmlbh) && hasfileslist.Any(q => q != null && q.fmlbh == x.mlbh));
 
+                    dto.jzml = hasfileslist.Concat(fmllist).Distinct().ToList();
                     var insert = await AddArchivesInfo(dto);
                     result.result = insert.result.Id;
                     result.IsSucceed = true;
@@ -588,10 +578,8 @@ namespace _24Hour.Controllers.Common
             try
             {
                 var data = mapper.Map<JZJBXX>(dto);
-
                 var mls = dto.jzml.ToList();
                 var vloum = mapper.Map<List<JZML>>(mls);
-
                 var wjs = dto.jzml.SelectMany(x => x.jzwj).ToList();
                 var files = mapper.Map<List<JZWJItem>>(wjs);