修复权限校验返回错误

service-manager/src/main/java/com/winsun/controller/OrderConversionController.java

@@ -4,17 +4,13 @@ import com.alibaba.excel.EasyExcel;
 import com.alibaba.excel.ExcelWriter;
 import com.alibaba.excel.ExcelWriter;
 import com.alibaba.excel.support.ExcelTypeEnum;
 import com.alibaba.excel.support.ExcelTypeEnum;
 import com.alibaba.excel.write.metadata.WriteSheet;
 import com.alibaba.excel.write.metadata.WriteSheet;
-import com.baomidou.mybatisplus.plugins.Page;
 import com.winsun.auth.core.annotion.Permission;
 import com.winsun.auth.core.annotion.Permission;
 import com.winsun.auth.core.base.controller.BaseController;
 import com.winsun.auth.core.base.controller.BaseController;
 import com.winsun.auth.core.common.model.ResponseData;
 import com.winsun.auth.core.common.model.ResponseData;
 import com.winsun.auth.core.shiro.ShiroUser;
 import com.winsun.auth.core.shiro.ShiroUser;
-import com.winsun.bean.Order;
-import com.winsun.bean.YrymReport;
 import com.winsun.mapper.OrderMapper;
 import com.winsun.mapper.OrderMapper;
 import lombok.extern.slf4j.Slf4j;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang3.StringUtils;
 import org.apache.commons.lang3.StringUtils;
-import org.apache.poi.ss.formula.functions.Now;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestMethod;
 import org.springframework.web.bind.annotation.RequestMethod;
@@ -23,7 +19,6 @@ import org.springframework.web.bind.annotation.RestController;
 
 
 import javax.servlet.ServletOutputStream;
 import javax.servlet.ServletOutputStream;
 import javax.servlet.http.HttpServletResponse;
 import javax.servlet.http.HttpServletResponse;
-import java.io.IOException;
 import java.io.InputStream;
 import java.io.InputStream;
 import java.net.URLEncoder;
 import java.net.URLEncoder;
 import java.text.SimpleDateFormat;
 import java.text.SimpleDateFormat;
@@ -55,7 +50,7 @@ public class OrderConversionController extends BaseController {
                                                @RequestParam("conversionType")String conversionType){
                                                @RequestParam("conversionType")String conversionType){
         ShiroUser user = getShiroUser();
         ShiroUser user = getShiroUser();
         if (!user.getRoleNames().stream().anyMatch(roleName -> StringUtils.equalsAny(roleName, "超级管理员", "县分管理员（订单）"))) {
         if (!user.getRoleNames().stream().anyMatch(roleName -> StringUtils.equalsAny(roleName, "超级管理员", "县分管理员（订单）"))) {
-            ResponseData.error("无权限查询订单");
+            return ResponseData.error("无权限查询订单");
         }
         }
         List<Map<String,Object>> list = new ArrayList<Map<String,Object>>();
         List<Map<String,Object>> list = new ArrayList<Map<String,Object>>();
         if("".equals(startTime)&&"".equals(endTime)){
         if("".equals(startTime)&&"".equals(endTime)){