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

张天森

2022-11-14 5b3f7effde361525994ca9928e599b88a646593b

 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
        {