bug修改

huliguo

1 天以前 ffa0bfc08acddebf438f6f27a4efd401a88d4097

bug修改

 pt-admin/src/main/java/com/ruoyi/web/controller/common/CommonController.java

@@ -77,6 +77,35 @@
//        System.err.println(url);
        return ajax;
    }

    @ApiOperation(value = "文件上传", notes = "多个文件上传")
    @PostMapping("/uploadFiles")
    // 新增：批量上传文件
    public List<String> uploadFiles(List<MultipartFile> files) {
        List<String> urlList = new ArrayList<>();
        if (files == null || files.isEmpty()) {
            return urlList; // 返回空列表
        }

        for (MultipartFile file : files) {
            if (file.isEmpty()) {
                continue; // 跳过空文件
            }
            // 调用单个上传方法，添加到URL列表
            String url = null;
            try {
                AjaxResult ajax = uploadFile(file);
                url = ajax.get("url").toString();
            } catch (Exception e) {
                throw new RuntimeException(e);
            }
            if (url != null) {
                urlList.add(url);
            }
        }
        return urlList;
    }

    /**
     * 通用上传请求（多个）
     */

 pt-errand/src/main/java/com/ruoyi/errand/service/impl/OrderServiceImpl.java

@@ -353,11 +353,16 @@
        if (order==null
                ||order.getDelFlag().equals(DelFlagConstant.DELETE)
                ||!Objects.equals(order.getAppUserId(), appuser.getId())){
            throw new ServiceException("订单id错误");
            throw new ServiceException("该订单不存在");
        }
        if (order.getOrderStatus()!=1 && order.getOrderStatus()!=2){
            throw new ServiceException("订单状态错误");
        if (order.getOrderStatus()==3){
            throw new ServiceException("订单已被取消");
        }else if (order.getOrderStatus()==4){
            throw new ServiceException("订单已完成,不可修改");
        }else if (order.getOrderStatus()==5){
            throw new ServiceException("订单已完成,不可修改");
        }

        //判断地址簿id是否存在
        if (setConfirmOrderDTO.getAddressBookId()!=null){
            AddressBook addressBook = addressBookMapper.selectById(setConfirmOrderDTO.getAddressBookId());

 pt-framework/src/main/java/com/ruoyi/framework/config/SecurityConfig.java

@@ -119,7 +119,7 @@
            .authorizeHttpRequests((requests) -> {
                permitAllUrl.getUrls().forEach(url -> requests.antMatchers(url).permitAll());
                // 对于登录login 注册register 验证码captchaImage 允许匿名访问
                requests.antMatchers("/system/login", "/register", "/captchaImage","/screen/data","/common/upload","/system/user/profile/updatePwd").permitAll()
                requests.antMatchers("/system/login", "/register", "/captchaImage","/screen/data","/common/upload","/system/user/profile/updatePwd","/common/uploadFiles").permitAll()
                    // 静态资源，可匿名访问
                    .antMatchers(HttpMethod.GET, "/", "/*.html", "/**/*.html", "/**/*.css", "/**/*.js", "/profile/**").permitAll()
                    .antMatchers("/swagger-ui.html", "/swagger-resources/**", "/webjars/**", "/*/api-docs", "/druid/**","/swagger-ui/").permitAll()

 pt-system/src/main/java/com/ruoyi/system/object/vo/MenuTreeVO.java

@@ -27,4 +27,6 @@
    /** 子菜单 */
    @ApiModelProperty("子菜单")
    private List<MenuTreeVO> children = new ArrayList<MenuTreeVO>();

    private Integer orderNum;
}

 pt-system/src/main/resources/mapper/system/SysMenuMapper.xml

@@ -134,7 +134,7 @@
    </select>

    <select id="getAllRootMenu" resultType="com.ruoyi.system.object.vo.MenuTreeVO">
        select distinct sm.menu_id,sm.menu_name,sm.path,sm.menu_type
        select distinct sm.menu_id,sm.menu_name,sm.path,sm.menu_type,sm.order_num
        from  sys_menu  sm
        where
        sm.parent_id = 0 order by sm.order_num     asc