Public/cf_imes_server
6
0
Fork 0
mirror of http://192.168.1.205:9980/cf_devdept2/cf_imes_server.git synced 2026-08-12 21:02:08 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/main'

Browse Source
This commit is contained in:
gaoqr
2025-03-19 17:34:52 +08:00
parent 9f93ea382c 3f0767e576
commit 5614455572
3 changed files with 7 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
cf-module-prod-executor/cf-module-prod-executor-biz/src/main/resources/mapper/planitem/PlanItemMapper.xml
+4 -4
View File
@@ -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}
cf-module-system/cf-module-system-api/src/main/java/com/cf/imes/module/system/enums/ErrorCodeConstants.java
+2 -1
View File
@@ -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 ==========
cf-module-system/cf-module-system-biz/src/main/java/com/cf/imes/module/system/service/dept/DeptServiceImpl.java
+1 -1
View File
@@ -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);