一人一码订单调整（查询接口部分）

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

@@ -204,7 +204,7 @@ public class OrderController extends BaseController {
      */
      */
     @Permission(menuname = "查询订单信息", value = "list", method = RequestMethod.POST)
     @Permission(menuname = "查询订单信息", value = "list", method = RequestMethod.POST)
     //@RequestMapping(value="list", method = RequestMethod.POST)
     //@RequestMapping(value="list", method = RequestMethod.POST)
-    public ResponseData<Page<Order>> listOrder(
+    public Map<String,Object> listOrder(
             @RequestParam(name = "createTimeStart", required = false) String createTimeStart,
             @RequestParam(name = "createTimeStart", required = false) String createTimeStart,
             @RequestParam(name = "createTimeEnd", required = false) String createTimeEnd,
             @RequestParam(name = "createTimeEnd", required = false) String createTimeEnd,
             @RequestParam(name = "successTimeStart", required = false) String successTimeStart,
             @RequestParam(name = "successTimeStart", required = false) String successTimeStart,
@@ -216,9 +216,12 @@ public class OrderController extends BaseController {
             @RequestParam(name = "orderStatus", required = false) String orderStatus,@RequestParam(name = "hehuorenArea", required = false) String hehuorenArea,
             @RequestParam(name = "orderStatus", required = false) String orderStatus,@RequestParam(name = "hehuorenArea", required = false) String hehuorenArea,
             @RequestParam(name = "customerName", required = false) String customerName, @RequestParam(name = "pageNo", required = false) int pageNo,
             @RequestParam(name = "customerName", required = false) String customerName, @RequestParam(name = "pageNo", required = false) int pageNo,
             @RequestParam(name = "pageSize", required = false) int pageSize) {
             @RequestParam(name = "pageSize", required = false) int pageSize) {
+        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, "超级管理员"))) {
-            return ResponseData.error("无数据权限");
+            map.put("error","无数据权限");
+            return map;
         }
         }
 
 
         Wrapper<Order> wrapper = new EntityWrapper();
         Wrapper<Order> wrapper = new EntityWrapper();
@@ -242,8 +245,18 @@ public class OrderController extends BaseController {
         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);
         page.setRecords(aPackage);
         page.setRecords(aPackage);
-
-        return ResponseData.success(page, "查询完毕！");
+        if (user.getRoleNames().stream().anyMatch(roleName -> StringUtils.equalsAny(roleName, "楼长","受理人员"))) {
+            map.put("isAbnormal",false);
+        }else {
+            map.put("isAbnormal",true);
+        }
+        if (user.getRoleNames().stream().anyMatch(roleName -> StringUtils.equalsAny(roleName, "修改身份证","超级管理员"))) {
+            map.put("isEdit",true);
+        }else {
+            map.put("isEdit",false);
+        }
+        map.put("page",ResponseData.success(page,"查询成功！"));
+        return map;
     }
     }
 
 
     /**
     /**