Merge branch 'zigonggao_dev' into huacheng_test

fengjin

2022-11-14 7b7ae2fbc3c43cf08949b2fd8949ea6c17b3c129

 flower_city/src/main/java/com/dg/core/controller/GuideRepairOrderController.java

@@ -397,8 +397,8 @@
//                userId=sysUser.getUserId()+"";
//            }
            userId=sysUser.getUserId()+"";
            ids=new ArrayList<>();
            ids.add(sysUser.getDepartmentId());
//            ids=new ArrayList<>();
//            ids.add(sysUser.getDepartmentId());
        }
        else
        {
@@ -432,8 +432,8 @@
//                userId=sysUser.getUserId()+"";
//            }
            userId=sysUser.getUserId()+"";
            ids=new ArrayList<>();
            ids.add(sysUser.getDepartmentId());
//            ids=new ArrayList<>();
//            ids.add(sysUser.getDepartmentId());
        }
        else
        {