添加快递公司查询限制

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

@@ -462,9 +462,15 @@ public class OrderController extends BaseController {
         wrapper.eq(StringUtils.isNotBlank(contactNumber), "contact_number", contactNumber);
         wrapper.eq(StringUtils.isNotBlank(hehuorenSchool), "hehuoren_school", hehuorenSchool);
         wrapper.like(StringUtils.isNotBlank(hehuorenName), "hehuoren_name", hehuorenName, SqlLike.DEFAULT);
+        if (user.getRoleNames().stream().anyMatch(roleName -> StringUtils.equalsAny(roleName, "快递公司"))) {
+            wrapper.eq("hehuoren_area", "本部");
+        }else{
             wrapper.eq(StringUtils.isNotBlank(hehuorenArea), "hehuoren_area", hehuorenArea);
+        }
+
         if (user.getRoleNames().stream().anyMatch(roleName -> StringUtils.equalsAny(roleName, "快递公司"))) {
             wrapper.eq("order_status", "待配送");
+            wrapper.isNotNull("order_id");
         }else{
             wrapper.eq(StringUtils.isNotBlank(orderStatus), "order_status", orderStatus).orderBy("create_time",false);
         }
@@ -700,13 +706,14 @@ public class OrderController extends BaseController {
         }
 
         if (StringUtils.isNotBlank(orderStatus)) {
-            if (user.getRoleNames().stream().anyMatch(roleName -> StringUtils.equalsAny(roleName, "快递公司"))) {
-                map.put("orderStatus", "待配送");
-            }else{
             map.put("orderStatus", orderStatus);
         }
-        }
 
+        if (user.getRoleNames().stream().anyMatch(roleName -> StringUtils.equalsAny(roleName, "快递公司"))) {
+            map.put("orderStatus", "待配送");
+            map.put("hehuorenArea", "本部");
+            map.put("isYzk", true);
+        }
 
         try {
             taskImport.taskImport(map);

task/src/main/java/com/winsun/service/ExportService.java

@@ -93,6 +93,16 @@ public class ExportService extends BaseController {
         if(map.containsKey("orderStatus")){
             orderStatus = map.get("orderStatus").toString();
         }
+        String hehuorenArea = "";
+        if (map.containsKey("hehuorenArea")) {
+            hehuorenArea = map.get("hehuorenArea").toString();
+        }
+        boolean isYzk = false;
+        if (map.containsKey("isYzk")) {
+            isYzk = true;
+        }
+
+
         EntityWrapper<Order> wrapper = new EntityWrapper();
         wrapper.ge(StringUtils.isNotBlank(createTimeStart), "create_time", createTimeStart);
         wrapper.le(StringUtils.isNotBlank(createTimeEnd), "create_time", createTimeEnd);
@@ -101,6 +111,8 @@ public class ExportService extends BaseController {
         wrapper.eq(StringUtils.isNotBlank(userType), "user_type", userType);
         wrapper.eq(StringUtils.isNotBlank(orderNumber), "order_number", orderNumber);
         //wrapper.eq(StringUtils.isNotBlank(kapin), "kapin", kapin);
+        wrapper.isNotNull(isYzk, "order_id");
+        wrapper.eq(StringUtils.isNotBlank(hehuorenArea), "hehuoren_area", hehuorenArea);
         wrapper.eq(StringUtils.isNotBlank(customerName), "customer_name", customerName);
         wrapper.eq(StringUtils.isNotBlank(businessNumber), "business_number", businessNumber);
         wrapper.eq(StringUtils.isNotBlank(contactNumber), "contact_number", contactNumber);