限制快递公司查询

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

@@ -440,7 +440,7 @@ public class OrderController extends BaseController {
         Map<String,Object> map = new HashMap<>();
         Map<String,Object> map = new HashMap<>();
 
 
         ShiroUser user = getShiroUser();
         ShiroUser user = getShiroUser();
-        if (!user.getRoleNames().stream().anyMatch(roleName -> StringUtils.equalsAny(roleName, "超级管理员", "系统管理员", "县分管理员（订单）", "合伙人"))) {
+        if (!user.getRoleNames().stream().anyMatch(roleName -> StringUtils.equalsAny(roleName, "超级管理员", "系统管理员", "县分管理员（订单）", "合伙人", "快递公司"))) {
             map.put("error","无数据权限");
             map.put("error","无数据权限");
             return map;
             return map;
         }
         }
@@ -463,7 +463,12 @@ public class OrderController extends BaseController {
         wrapper.eq(StringUtils.isNotBlank(hehuorenSchool), "hehuoren_school", hehuorenSchool);
         wrapper.eq(StringUtils.isNotBlank(hehuorenSchool), "hehuoren_school", hehuorenSchool);
         wrapper.like(StringUtils.isNotBlank(hehuorenName), "hehuoren_name", hehuorenName, SqlLike.DEFAULT);
         wrapper.like(StringUtils.isNotBlank(hehuorenName), "hehuoren_name", hehuorenName, SqlLike.DEFAULT);
         wrapper.eq(StringUtils.isNotBlank(hehuorenArea), "hehuoren_area", hehuorenArea);
         wrapper.eq(StringUtils.isNotBlank(hehuorenArea), "hehuoren_area", hehuorenArea);
+        if (user.getRoleNames().stream().anyMatch(roleName -> StringUtils.equalsAny(roleName, "快递公司"))) {
+            wrapper.eq("order_status", "待配送");
+        }else{
             wrapper.eq(StringUtils.isNotBlank(orderStatus), "order_status", orderStatus).orderBy("create_time",false);
             wrapper.eq(StringUtils.isNotBlank(orderStatus), "order_status", orderStatus).orderBy("create_time",false);
+        }
+
 
 
         Page<Order> page = new Page<>(pageNo, pageSize);
         Page<Order> page = new Page<>(pageNo, pageSize);
         List<Order> aPackage = orderMapper.selectPage(page, wrapper);
         List<Order> aPackage = orderMapper.selectPage(page, wrapper);