diff --git a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/resources/mapper/planitem/PlanItemMapper.xml b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/resources/mapper/planitem/PlanItemMapper.xml
index a28b39895..020ddcb34 100644
--- a/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/resources/mapper/planitem/PlanItemMapper.xml
+++ b/cf-module-prod-executor/cf-module-prod-executor-biz/src/main/resources/mapper/planitem/PlanItemMapper.xml
@@ -219,10 +219,10 @@
             og.order_id as orderId
 
         from orders o
-                 left join (select * from order_goods where organ_id = #{organId}) og on o.organ_id = og.organ_id and o.id = og.order_id
-                 left join (select * from order_plate where organ_id = #{organId}) op on og.organ_id = op.organ_id and og.order_id = op.order_id and og.id = op.goods_id
-                 left join (select * from order_item where organ_id = #{organId}) oi on op.organ_id = oi.organ_id and op.order_id = oi.order_id and op.id = oi.plate_id
-                 left join (select * from order_plan_item where organ_id = #{organId}) opi on op.organ_id = opi.organ_id and op.order_id = opi.order_id and op.id = opi.plate_id
+                 left join order_goods  og on o.id = og.order_id and og.organ_id = #{organId}
+                 left join order_plate  op on og.id = op.goods_id and op.organ_id = #{organId}
+                 left join order_item  oi on op.id = oi.plate_id and oi.organ_id = #{organId}
+                 left join order_plan_item opi on op.order_id = opi.order_id and op.id = opi.plate_id and opi.organ_id = #{organId}
 
             ${ew.customSqlSegment}
 
diff --git a/cf-module-system/cf-module-system-api/src/main/java/com/cf/imes/module/system/enums/ErrorCodeConstants.java b/cf-module-system/cf-module-system-api/src/main/java/com/cf/imes/module/system/enums/ErrorCodeConstants.java
index eb007f833..a0079d424 100644
--- a/cf-module-system/cf-module-system-api/src/main/java/com/cf/imes/module/system/enums/ErrorCodeConstants.java
+++ b/cf-module-system/cf-module-system-api/src/main/java/com/cf/imes/module/system/enums/ErrorCodeConstants.java
@@ -72,7 +72,8 @@ public class ErrorCodeConstants {
     public static final ErrorCode DEPT_PARENT_IS_CHILD = new ErrorCode(1_002_004_007, "不能设置自己的子部门为父部门");
     public static final ErrorCode DEPT_USER_OPER_NOT_ALLOW = new ErrorCode(1_002_004_008, "不允许操作用户自身部门");
     public static final ErrorCode PARENT_DEPT_USER_OPER_NOT_ALLOW = new ErrorCode(1_002_004_009, "不允许操作用户自身部门及其上级部门");
-    public static final ErrorCode DEPT_DISABLE = new ErrorCode(1_002_004_006, "部门({})已被禁用");
+    public static final ErrorCode DEPT_DISABLE = new ErrorCode(1_002_004_010, "部门({})已被禁用");
+    public static final ErrorCode DEPT_NOT_ALLOWED_LOGIN = new ErrorCode(1_002_004_011, "部门({})已被禁用，无法登录");
 
 
     // ========== 岗位模块 1-002-005-000 ==========
diff --git a/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/service/dept/DeptServiceImpl.java b/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/service/dept/DeptServiceImpl.java
index c4255c43b..1f0c54e46 100644
--- a/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/service/dept/DeptServiceImpl.java
+++ b/cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/service/dept/DeptServiceImpl.java
@@ -318,7 +318,7 @@ public class DeptServiceImpl implements DeptService {
             return;
         }
         if (!CommonStatusEnum.ENABLE.getStatus().equals(deptDO.getStatus())) {
-            throw ServiceExceptionUtil.exception(ErrorCodeConstants.DEPT_DISABLE, deptDO.getName());
+            throw ServiceExceptionUtil.exception(ErrorCodeConstants.DEPT_NOT_ALLOWED_LOGIN, deptDO.getName());
         }
         // 递归校验上级部门
         validParentDept(deptDO);