Merge branch 'dev' of http://120.76.84.145:10101/gitblit/r/java/JiaDianHuiS...

xuhy

2025-04-27 bfa6af3b50fa16ed4f1d835f8f9fc9237c83e64c

Merge branch 'dev' of http://120.76.84.145:10101/gitblit/r/java/JiaDianHuiShou into dev

 ruoyi-service/ruoyi-admin/src/main/java/com/ruoyi/admin/controller/OrderController.java

@@ -711,11 +711,11 @@
    public R<List<MasterWorker>> map(String cityCode,String name) {

        LoginUser loginUser = tokenService.getLoginUser();
        if (null == loginUser) {
            return R.loginExpire("登录失效！");
        }
//        if (null == loginUser) {
//            return R.loginExpire("登录失效！");
//        }
        if (cityCode==null) {
            if (loginUser.getIsFranchisee()) {
            if (loginUser!=null&&loginUser.getIsFranchisee()) {
                cityCode = loginUser.getCityList().get(0);
            } else {
                cityCode = "420100";