diff --git a/src/main/java/com/glxp/api/controller/auth/LoginController.java b/src/main/java/com/glxp/api/controller/auth/LoginController.java
index 4b0a7715e..9bce74ce3 100644
--- a/src/main/java/com/glxp/api/controller/auth/LoginController.java
+++ b/src/main/java/com/glxp/api/controller/auth/LoginController.java
@@ -208,6 +208,8 @@ public class LoginController extends BaseController {
         map.put("time", MsDateUtil.getDateTime());
         LoginResponse loginResponse = new LoginResponse();
         loginResponse.setId(authAdmin.getId() + "");
+        loginResponse.setUserName(authAdmin.getUserName());
+        loginResponse.setEmployeeName(authAdmin.getEmployeeName());
         loginResponse.setToken(token);
         loginResponse.setDept(authAdmin.getLocDeptCode());
         loginResponse.setDeptName(authAdmin.getDeptName());
diff --git a/src/main/java/com/glxp/api/controller/basic/BasicCollectUserController.java b/src/main/java/com/glxp/api/controller/basic/BasicCollectUserController.java
index cfa37fa91..a0d6a27cd 100644
--- a/src/main/java/com/glxp/api/controller/basic/BasicCollectUserController.java
+++ b/src/main/java/com/glxp/api/controller/basic/BasicCollectUserController.java
@@ -36,7 +36,7 @@ public class BasicCollectUserController extends BaseController {
 
     @GetMapping("/udiwms/sysWorkplace/getUserBindWork")
     public BaseResponse getUserBindWork(BasicCollectUserRequest request) {
-        if (request != null && request.getAutoUserId() != null && request.getAutoUserId() == 1){
+        if (request != null && request.getAutoUserId() != null && request.getAutoUserId() == 1) {
             request.setUserId(String.valueOf(getUserId()));
         }
         List<UserWorkResponse> page = basicCollectUserService.filterList(request);
diff --git a/src/main/java/com/glxp/api/controller/basic/SysWorkplaceDocumentController.java b/src/main/java/com/glxp/api/controller/basic/SysWorkplaceDocumentController.java
index 39963e79c..93a79922d 100644
--- a/src/main/java/com/glxp/api/controller/basic/SysWorkplaceDocumentController.java
+++ b/src/main/java/com/glxp/api/controller/basic/SysWorkplaceDocumentController.java
@@ -78,13 +78,13 @@ public class SysWorkplaceDocumentController extends BaseController {
     public BaseResponse workplaceBindBusType(@RequestBody WorkBindBusTypeRequest request) {
         Long workplaceCode = request.getWorkplaceCode();
         List<String> documentTypeCodes = request.getDocumentTypeCodes();
-        if (documentTypeCodes.size() == 0){
+        if (documentTypeCodes.size() == 0) {
             return ResultVOUtils.error("请选择绑定的业务类型");
         }
         List<SysWorkplaceBus> adds = new ArrayList<>();
         for (String documentTypeCode : documentTypeCodes) {
             SysWorkplaceBus one = sysWorkplaceBusService.getOne(new LambdaQueryWrapper<SysWorkplaceBus>().eq(SysWorkplaceBus::getBusTypeCode, documentTypeCode).eq(SysWorkplaceBus::getWorkplaceCode, workplaceCode));
-            if (one!= null) {
+            if (one != null) {
                 return ResultVOUtils.error("该工位已经绑定该单据类型");
             }
             SysWorkplaceBus sysWorkplaceBus = new SysWorkplaceBus();
@@ -94,7 +94,7 @@ public class SysWorkplaceDocumentController extends BaseController {
         }
 
         boolean save = sysWorkplaceBusService.saveBatch(adds);
-        if (!save){
+        if (!save) {
             return ResultVOUtils.success("绑定失败");
         }
         return ResultVOUtils.success("绑定成功");
@@ -119,10 +119,10 @@ public class SysWorkplaceDocumentController extends BaseController {
 
     @PostMapping("/udiwms/sysWorkplace/updateType")
     public BaseResponse updateType(@RequestBody SysWorkplaceDocumentEntity entity) {
-        if (entity.getInvCode() == null){
+        if (entity.getInvCode() == null) {
             entity.setInvCode(0);
         }
-        if (entity.getScanType() == 1){
+        if (entity.getScanType() == 1) {
             entity.setOrderFinishVerify(4);
         }
 
@@ -146,7 +146,7 @@ public class SysWorkplaceDocumentController extends BaseController {
     @CusRedissonAnnotation(cacheName = RedissonCacheKey.RM_WORK_BUS_TYPE, key = {"#entity.documentTypeCode"}, waitTime = 3, timeOutMsg = "请勿重复提交")
     @PostMapping("/udiwms/sysWorkplace/removeBusTypeByBusTypeAndWorkplace")
     public BaseResponse removeBusTypeByBusTypeAndWorkplace(@RequestBody SysWorkplaceDocumentEntity entity) {
-        Boolean save = sysWorkplaceDocumentService.removeBusTypeByBusTypeAndWorkplace(entity.getWorkplaceCode(),entity.getDocumentTypeCode());
+        Boolean save = sysWorkplaceDocumentService.removeBusTypeByBusTypeAndWorkplace(entity.getWorkplaceCode(), entity.getDocumentTypeCode());
         if (!save) {
             return ResultVOUtils.error("移除失败");
         }
diff --git a/src/main/java/com/glxp/api/controller/collect/IoCollectOrderController.java b/src/main/java/com/glxp/api/controller/collect/IoCollectOrderController.java
index 83e568c8c..542f1faed 100644
--- a/src/main/java/com/glxp/api/controller/collect/IoCollectOrderController.java
+++ b/src/main/java/com/glxp/api/controller/collect/IoCollectOrderController.java
@@ -67,8 +67,8 @@ public class IoCollectOrderController extends BaseController {
     @Resource
     private BasicCollectUserService basicCollectUserService;
 
-    @GetMapping("/udiwms/basic/collect/order/filter")
-    public BaseResponse filterOrder(CollectOrderRequest collectOrderRequest) {
+    @PostMapping("/udiwms/basic/collect/order/filter")
+    public BaseResponse filterOrder(@RequestBody CollectOrderRequest collectOrderRequest) {
 
         List<Long> workPlaceCodes = null;
         List<SysWorkplaceDocumentResponse> sysWorkplaceDocumentResponses = null;
diff --git a/src/main/java/com/glxp/api/res/auth/LoginResponse.java b/src/main/java/com/glxp/api/res/auth/LoginResponse.java
index 565b92db3..f720fec85 100644
--- a/src/main/java/com/glxp/api/res/auth/LoginResponse.java
+++ b/src/main/java/com/glxp/api/res/auth/LoginResponse.java
@@ -15,6 +15,8 @@ public class LoginResponse {
     private String dept;
     private String deptName;
 
+    private String employeeName;
+    private String userName;
     /**
      * inout/IoCreateScanOrder
      * inout/IoDealOrder