提交 e63e97bc authored 作者: 000516's avatar 000516 提交者: Coding

Accept Merge Request #290: (lql-dev -> qa)

Merge Request: 促销计划新增 - 城市经理不可新增 Created By: @李秋林 Accepted By: @李秋林 URL: https://g-pkkp8204.coding.net/p/promotion/d/promotion-service/git/merge/290?initial=true
...@@ -47,6 +47,11 @@ public class PromPlanCoreController { ...@@ -47,6 +47,11 @@ public class PromPlanCoreController {
public R selfPlan(@RequestBody ActivityPlanVo activityPlanVo) { public R selfPlan(@RequestBody ActivityPlanVo activityPlanVo) {
// 判断当前账号是否是城市经理 // 判断当前账号是否是城市经理
boolean isSelf = manageEmployeeQueryService.isOneSelf(activityPlanVo.getEmployeeNo()); boolean isSelf = manageEmployeeQueryService.isOneSelf(activityPlanVo.getEmployeeNo());
// todo 当前时间不可新增
if (isSelf) {
throw new ParamException(RCode.FUNCTION_RESTRICT_ERROR);
}
if (!isSelf) { if (!isSelf) {
throw new DataException(RCode.EMP_PRIVILEGE_ERROR); throw new DataException(RCode.EMP_PRIVILEGE_ERROR);
}else { }else {
...@@ -178,6 +183,12 @@ public class PromPlanCoreController { ...@@ -178,6 +183,12 @@ public class PromPlanCoreController {
} }
// 操作人如果是城市经理的话,操作人与归属人必需一致 // 操作人如果是城市经理的话,操作人与归属人必需一致
boolean operIsSelf = manageEmployeeQueryService.isOneSelf(operVo.getOperNo()); boolean operIsSelf = manageEmployeeQueryService.isOneSelf(operVo.getOperNo());
// todo 当前时间不可新增
if (operIsSelf){
throw new ParamException(RCode.FUNCTION_RESTRICT_ERROR);
}
if (operIsSelf && !operVo.getEmployeeNo().equals(operVo.getOperNo())){ if (operIsSelf && !operVo.getEmployeeNo().equals(operVo.getOperNo())){
throw new ParamException(RCode.ACTIVITY_PLAN_EMPLOYEE_CREATE); throw new ParamException(RCode.ACTIVITY_PLAN_EMPLOYEE_CREATE);
} }
......
Markdown 格式
0%
您添加了 0 到此讨论。请谨慎行事。
请先完成此评论的编辑!
注册 或者 后发表评论