Merge remote-tracking branch 'origin/test' into test

src/main/java/com/ydtech/modules/admin/service/impl/SysDeptServiceImpl.java

@@ -164,6 +164,8 @@ public class SysDeptServiceImpl extends ServiceImpl<SysDeptMapper, SysDept>
                             i.setChildren(new ArrayList<>());
                         }
                         i.getChildren().addAll(value);
+                        //处理总部的排序为空造成的空指针报错处理  add by   hxl
+                        i.setOrderNum(i.getOrderNum()==null?0:i.getOrderNum());
                         result.add(i);
                     }
                 })

src/main/java/com/ydtech/modules/admin/service/impl/SysUserServiceImpl.java

@@ -904,8 +904,10 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> impl
                         quUserNum.setMainAcceptInsuranceSum(mainAcceptInsuranceSum.getMainAcceptInsuranceSum());
                     }
                 }
-
-                quUserNums.add(quUserNum);
+                if (quUserNum.getAreaName() != null){
+                    quUserNums.add(quUserNum);
+                }
+//                quUserNums.add(quUserNum);
             }
         }