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 a5987d12..a88b6f31 100644
--- a/src/main/java/com/glxp/api/controller/auth/LoginController.java
+++ b/src/main/java/com/glxp/api/controller/auth/LoginController.java
@@ -150,10 +150,12 @@ public class LoginController extends BaseController {
         if (authAdmin == null) {
             throw new JsonException(ResultEnum.DATA_NOT, "用户名或密码错误");
         }
-
-        if (!PasswordUtils.authAdminPwd(loginRequest.getPassword()).equals(authAdmin.getPassWord())) {
+        if (!PasswordUtils.authAdminPwd(loginRequest.getPassword()).equals(SecureUtil.sha256(authAdmin.getPassWord()))) {
             throw new JsonException(ResultEnum.DATA_NOT, "用户名或密码错误");
         }
+//        if (!PasswordUtils.authAdminPwd(loginRequest.getPassword()).equals(authAdmin.getPassWord())) {
+//            throw new JsonException(ResultEnum.DATA_NOT, "用户名或密码错误");
+//        }
         if (authAdmin.getUserFlag() == 0) {
             throw new JsonException(ResultEnum.DATA_NOT, "该用户已被禁用！");
         }
diff --git a/src/main/java/com/glxp/api/controller/inout/IoOrderReviewController.java b/src/main/java/com/glxp/api/controller/inout/IoOrderReviewController.java
index 69d934d2..6aa13583 100644
--- a/src/main/java/com/glxp/api/controller/inout/IoOrderReviewController.java
+++ b/src/main/java/com/glxp/api/controller/inout/IoOrderReviewController.java
@@ -272,29 +272,29 @@ public class IoOrderReviewController extends BaseController {
         if (orderEntity.getStatus() == ConstantStatus.ORDER_STATUS_AUDITED) {
             return ResultVOUtils.error(500, "单据已验收！");
         }
-        if (updateExportStatusRequest.isEntrust() && updateExportStatusRequest.getEntrustId() != null) {
-            EntrustReceEntity entrustReceEntity = entrustReceService.findById(updateExportStatusRequest.getEntrustId());
-            if (entrustReceEntity == null) {
-                return ResultVOUtils.error(500, "无验收权限！");
-            } else {
-
-                if (orderEntity.getFromType().intValue() != ConstantStatus.FROM_CHANGE && orderEntity.getFromType().intValue() != ConstantStatus.FROM_PEACE_CHANGE) {
-                    if (StrUtil.isNotEmpty(entrustReceEntity.getEntrustAction())) {
-                        transferOrder(orderEntity, entrustReceEntity);
-                    }
-                }
-                if (!entrustReceEntity.getFinishRece()) {
-                    redisUtil.del(ConstantStatus.REDIS_BILLNO + orderEntity.getBillNo());
-                    redisUtil.del(ConstantStatus.REDIS_BILLNO_CODES + orderEntity.getBillNo());
-                    return ResultVOUtils.success("验收成功！");
-                } else {
-                    ReviewFinishRequest reviewFinishRequest = new ReviewFinishRequest();
-                    BeanUtils.copyProperties(updateExportStatusRequest, reviewFinishRequest);
-                    log.error("更新外网验收状态");
-                    updateSpmsStauts(reviewFinishRequest, authAdmin.getId() + "");
-                    return updateReview(authAdmin, orderEntity);
+        if (updateExportStatusRequest.isEntrust()) {
+//            EntrustReceEntity entrustReceEntity = entrustReceService.findById(updateExportStatusRequest.getEntrustId());
+//            if (entrustReceEntity == null) {
+//                return ResultVOUtils.error(500, "无验收权限！");
+//            } else {
+            EntrustReceEntity entrustReceEntity = entrustReceService.findByUnique(orderEntity.getAction(), getUserId());
+            if (orderEntity.getFromType().intValue() != ConstantStatus.FROM_CHANGE && orderEntity.getFromType().intValue() != ConstantStatus.FROM_PEACE_CHANGE) {
+                if (StrUtil.isNotEmpty(entrustReceEntity.getEntrustAction())) {
+                    transferOrder(orderEntity, entrustReceEntity);
                 }
             }
+            if (!entrustReceEntity.getFinishRece()) {
+                redisUtil.del(ConstantStatus.REDIS_BILLNO + orderEntity.getBillNo());
+                redisUtil.del(ConstantStatus.REDIS_BILLNO_CODES + orderEntity.getBillNo());
+                return ResultVOUtils.success("验收成功！");
+            } else {
+                ReviewFinishRequest reviewFinishRequest = new ReviewFinishRequest();
+                BeanUtils.copyProperties(updateExportStatusRequest, reviewFinishRequest);
+                log.error("更新外网验收状态");
+                updateSpmsStauts(reviewFinishRequest, authAdmin.getId() + "");
+                return updateReview(authAdmin, orderEntity);
+            }
+//            }
         } else {
             ReviewFinishRequest reviewFinishRequest = new ReviewFinishRequest();
             BeanUtils.copyProperties(updateExportStatusRequest, reviewFinishRequest);