diff --git a/ghy-framework/src/main/java/com/ghy/framework/shiro/service/SysRegisterService.java b/ghy-framework/src/main/java/com/ghy/framework/shiro/service/SysRegisterService.java
index 6a5e5f1b..2b037820 100644
--- a/ghy-framework/src/main/java/com/ghy/framework/shiro/service/SysRegisterService.java
+++ b/ghy-framework/src/main/java/com/ghy/framework/shiro/service/SysRegisterService.java
@@ -47,6 +47,7 @@ public class SysRegisterService
         } else if (UserConstants.USER_NAME_NOT_UNIQUE.equals(userService.checkPhoneUnique(sysUser))) {
             msg = "保存手机号码'" + userAddDTO.getPhonenumber() + "'失败，该手机号码已被注册";
         } else {
+            sysUser.setDeptId(101L);
             sysUser.setPwdUpdateDate(DateUtils.getNowDate());
             sysUser.setUserName(userAddDTO.getLoginName());
             sysUser.setSalt(ShiroUtils.randomSalt());
diff --git a/ghy-order/src/main/resources/mapper/order/OrderMasterMapper.xml b/ghy-order/src/main/resources/mapper/order/OrderMasterMapper.xml
index a2a57888..6b261ebe 100644
--- a/ghy-order/src/main/resources/mapper/order/OrderMasterMapper.xml
+++ b/ghy-order/src/main/resources/mapper/order/OrderMasterMapper.xml
@@ -138,8 +138,7 @@
             </if>
             <if test="workerId == -1">
                 AND om.worker_id IS NULL
-                AND ( (om.order_mode in ('01','03','04'))
-                     OR (om.order_mode = '02' and fm.pay_status = 1) OR (om.order_mode is null))
+                AND ( (om.order_mode in ('01','03','04','02'))  OR (om.order_mode is null))
             </if>
             <if test="sysPayStatus != null">
                 AND fm.pay_status = #{sysPayStatus}