1.提交订单给导办人员消息推送 2.提交设置超时时间 3.修改bug

fengjin

2022-10-17 fc17ca4f6b87d5a08f67544bac3e5175fbb53085

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

@@ -62,7 +62,7 @@
            }

            //本地表查询用户
            user = IUserService.selectData(huaChengSysUser.getUserId()+"");
            user = IUserService.selectData(huaChengSysUser.getUserId()+"",null);
            if (user == null) {
                //本地没有此用户  新用户
                SysUser newSysUser=new SysUser();
@@ -79,7 +79,7 @@
                IUserService.insertConfig(newSysUser);
            }

            user = IUserService.selectData(huaChengSysUser.getUserId()+"");
            user = IUserService.selectData(huaChengSysUser.getUserId()+"",null);

            if (user == null) {
                return ResultData.error("用户不存在！请联系管理员");
@@ -100,6 +100,7 @@
            map.put("token", token);
            map.put("userId", user.getUserId());
            map.put("userName", user.getUserName());
            map.put("permission", user.getPermission());

            return ResultData.success(map);
        }
@@ -125,6 +126,7 @@
            map.put("token", token);
            map.put("userId", user.getUserId());
            map.put("userName", user.getUserName());
            map.put("permission", user.getPermission());

            return ResultData.success(map);
        }
@@ -280,7 +282,7 @@
            return error("userId不能为空");
        }

        SysUser sysUser=IUserService.selectData(userId);
        SysUser sysUser=IUserService.selectData(userId,null);
        //删除标志（0代表存在 2代表删除）
        sysUser.setDelFlag("2");
        return toAjax(IUserService.updateConfig(sysUser));
@@ -308,7 +310,7 @@
            return error("密码不能为空");
        }

        SysUser sysUser=IUserService.selectData(config.getUserId()+"");
        SysUser sysUser=IUserService.selectData(config.getUserId()+"",null);
        if(sysUser==null)
        {
            return error("用户不存在");