Merge branch 'huacheng_test' of http://gitlab.nhys.cdnhxx.com/root/zhihuish...

fengjin

2022-11-10 b40c300928c6900fdef06deaf19cd25a2baf0b61

Merge branch 'huacheng_test' of http://gitlab.nhys.cdnhxx.com/root/zhihuishequ into huacheng_test

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

@@ -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
        {