Commit 5469bc66 authored by libin's avatar libin

Merge remote-tracking branch 'origin/dev' into dev

parents d6e598d9 dcf2761e
...@@ -223,11 +223,12 @@ public class BackStageOrderController extends CommonBaseController implements Us ...@@ -223,11 +223,12 @@ public class BackStageOrderController extends CommonBaseController implements Us
List<Integer> list = userFeign.getUserIdByUsername(dto.getKeywords()); List<Integer> list = userFeign.getUserIdByUsername(dto.getKeywords());
if(list != null) { if(list != null) {
userIds.addAll(list); userIds.addAll(list);
} else { }
if(userIds.size() <= 0) {
return ObjectRestResponse.succ(new PageDataVO<>()); return ObjectRestResponse.succ(new PageDataVO<>());
} }
} }
dto.setUserIds(userIds);
UserDTO userDTO = getAdminUserInfo(); UserDTO userDTO = getAdminUserInfo();
if (userDTO == null) { if (userDTO == null) {
return ObjectRestResponse.succ(new PageDataVO<>()); return ObjectRestResponse.succ(new PageDataVO<>());
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment