|
@@ -82,7 +82,7 @@ public class SysImplementPlanManager {
|
|
|
plan.setCreateTime(now);
|
|
|
plan.setUpdateTime(now);
|
|
|
|
|
|
- if (resource.getParentId() != 0){
|
|
|
+ if (resource.getParentId() != 0) {
|
|
|
|
|
|
Long availScore = implementPlanService.calcAvailScore(resource.getParentId(), resource.getPlanScore());
|
|
|
SysImplementPlan parentPlan = new SysImplementPlan();
|
|
@@ -160,7 +160,7 @@ public class SysImplementPlanManager {
|
|
|
|
|
|
List<Tree<Integer>> builds = new ArrayList<>();
|
|
|
// 药企 || 一级
|
|
|
- if (entLevel == 0 || entLevel == 1){
|
|
|
+ if (entLevel == 0 || entLevel == 1) {
|
|
|
List<Tree<Integer>> build = TreeUtil.build(toPages, 0);
|
|
|
builds.addAll(build);
|
|
|
}
|
|
@@ -168,8 +168,8 @@ public class SysImplementPlanManager {
|
|
|
else {
|
|
|
|
|
|
for (TreeNode<Integer> node : toPages) {
|
|
|
- List<Tree<Integer>> build = TreeUtil.build(Collections.singletonList(node), node.getParentId());
|
|
|
- builds.addAll(build);
|
|
|
+ List<Tree<Integer>> build = TreeUtil.build(Collections.singletonList(node), node.getParentId());
|
|
|
+ builds.addAll(build);
|
|
|
}
|
|
|
}
|
|
|
|
|
@@ -237,7 +237,12 @@ public class SysImplementPlanManager {
|
|
|
else if (entLevel == 1) {
|
|
|
wrapper.and(wrp -> wrp.eq(SysImplementPlan::getConsigneeId, user.getDeptId()).or().eq(SysImplementPlan::getConsignorId, user.getDeptId()));
|
|
|
}
|
|
|
- // 药企,平台(只查询我下发的)
|
|
|
+ // 事业部管理员||药企(只查询我下发的)
|
|
|
+ else if (entLevel == -1) {
|
|
|
+ wrapper.eq(SysImplementPlan::getConsignorId, user.getDeptId())
|
|
|
+ .eq(SysImplementPlan::getParentId, 0);
|
|
|
+ }
|
|
|
+ // 平台||营销中心(查询全部)
|
|
|
else {
|
|
|
wrapper.eq(SysImplementPlan::getParentId, 0);
|
|
|
}
|
|
@@ -275,9 +280,9 @@ public class SysImplementPlanManager {
|
|
|
plan.setUpdateTime(now);
|
|
|
|
|
|
// 归还父计划的分值
|
|
|
- if (!result){
|
|
|
+ if (!result) {
|
|
|
SysImplementPlan p = implementPlanService.getById(resource.getPlanId());
|
|
|
- if (p.getParentId() != 0){
|
|
|
+ if (p.getParentId() != 0) {
|
|
|
SysImplementPlan parentPlan = implementPlanService.getById(p.getParentId());
|
|
|
parentPlan.setAvailScore(parentPlan.getAvailScore() + p.getPlanScore());
|
|
|
implementPlanService.updatePlan(parentPlan);
|