From f6c36a54e184d82b4fdb86982292f22e927fb668 Mon Sep 17 00:00:00 2001
From: LSH
Date: 星期三, 01 十一月 2023 15:58:22 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/crm/manager/controller/PlanController.java | 28 ++++++++++++++++++++++------
1 files changed, 22 insertions(+), 6 deletions(-)
diff --git a/src/main/java/com/zy/crm/manager/controller/PlanController.java b/src/main/java/com/zy/crm/manager/controller/PlanController.java
index 61a96cd..9a10e54 100644
--- a/src/main/java/com/zy/crm/manager/controller/PlanController.java
+++ b/src/main/java/com/zy/crm/manager/controller/PlanController.java
@@ -55,6 +55,8 @@
private OrderService orderService;
@Autowired
private SmsCodeService smsCodeService;
+ @Autowired
+ private ProcessPermissionsService processPermissionsService;
String PZH=" 鈥斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�斺�� ";
@@ -89,8 +91,8 @@
@RequestParam(required = false, value = "user_id") Long userId) {
return R.ok(planService.getPage(new Page<>(curr, limit)
, getHostId()
- , deptId == null ? null : String.valueOf(deptId)
- , userId == null ? getUserId() : userId
+ , deptId == null ? (userId == null? getDeptId().toString(): null) : String.valueOf(deptId)
+ , userId
, condition)
);
}
@@ -598,6 +600,8 @@
plan.setStep(1);
plan.setSettle(1);
plan.setSettleMsg(JSON.toJSONString(planDtoList));
+ plan.setUpdateBy(getUserId());
+ plan.setUpdateTime(now);
planService.updateById(plan);
return R.ok("鍥為��鎴愬姛");
}
@@ -675,12 +679,24 @@
wrapper.like("name", condition);
wrapper.eq("status",1);
- int type =1;
- if (getUser().getNickname().equals("鏉庝笘璞�2绾�")){
- type=2;
+
+ ProcessPermissions processPermissions1 = processPermissionsService.selectOne(new EntityWrapper<ProcessPermissions>().eq("process_memo", 5).eq("process", "1-1"));//2锛氭牳浠锋祦绋�
+ User manager1 = userService.selectById(processPermissions1.getUserId()); // 鑾峰彇鏍镐环娴佺▼鑺傜偣1纭浜�
+
+ ProcessPermissions processPermissions2 = processPermissionsService.selectOne(new EntityWrapper<ProcessPermissions>().eq("process_memo", 5).eq("process", "1-2"));//2锛氭牳浠锋祦绋�
+ User manager2 = userService.selectById(processPermissions2.getUserId()); // 鑾峰彇鏍镐环娴佺▼鑺傜偣1纭浜�
+
+
+ int type =0;
+ if (getUserId().equals(manager1.getId())){
+ type=1;//(璐ф灦)
+ }else if (getUserId().equals(manager2.getId())){
+ type = 2;//(闆嗘垚)
+ }else {
+ return R.error("浣犱笉鏄牳浠峰憳,鏃犳潈鎺ヤ换鍔�");
}
- List<Long> typeList = new ArrayList<>();
+ List<Long> typeList = new ArrayList<>();
List<PlanType> planTypes = planTypeService.selectList(new EntityWrapper<PlanType>().eq("type", type));
for (PlanType planType : planTypes){
typeList.add(planType.getId());
--
Gitblit v1.9.1