From 4efce59c899fc0c63f3bf14e4f64b846660c28bf Mon Sep 17 00:00:00 2001
From: LSH
Date: 星期四, 28 九月 2023 14:03:43 +0800
Subject: [PATCH] #bug修复
---
src/main/java/com/zy/crm/manager/controller/PlanController.java | 4 ++--
src/main/webapp/static/js/plan/plan.js | 2 +-
src/main/java/com/zy/crm/manager/entity/Plan.java | 6 +++---
3 files changed, 6 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 fee04bc..0ba45fb 100644
--- a/src/main/java/com/zy/crm/manager/controller/PlanController.java
+++ b/src/main/java/com/zy/crm/manager/controller/PlanController.java
@@ -151,7 +151,7 @@
// 鑷姩娣诲姞璺熻繘浜�
PlanFoll planFoll = new PlanFoll();
planFoll.setPlanId(plan.getId());
- planFoll.setUserId(manager.getId());
+ planFoll.setUserId(planLeader.getId());
if (!planFollService.insert(planFoll)) {
throw new CoolException("淇濇寔澶辫触锛岃閲嶈瘯");
}
@@ -527,7 +527,7 @@
Plan plan = planService.selectById(planId);
assert plan != null;
- if (plan.getSettle() != 2) {
+ if (plan.getSettle() != 1) {
return R.error();
}
// 鏌ユ壘瑙勫垝缁勯暱
diff --git a/src/main/java/com/zy/crm/manager/entity/Plan.java b/src/main/java/com/zy/crm/manager/entity/Plan.java
index 5189cd6..30d3faf 100644
--- a/src/main/java/com/zy/crm/manager/entity/Plan.java
+++ b/src/main/java/com/zy/crm/manager/entity/Plan.java
@@ -364,11 +364,11 @@
// return "绛夊緟缁勯暱瀹℃牳";
case 1:
return "绛夊緟鍞墠鍒嗛厤瑙勫垝鍛�";
- case 3:
+ case 2:
return "绛夊緟瑙勫垝鍛樻彁浜�";
- case 4:
+ case 3:
return "瑙勫垝鍛樺凡鎻愪氦";
- case 5:
+ case 4:
return "瀹℃壒閫氳繃";
default:
return String.valueOf(this.settle);
diff --git a/src/main/webapp/static/js/plan/plan.js b/src/main/webapp/static/js/plan/plan.js
index 02f119f..e48de1e 100644
--- a/src/main/webapp/static/js/plan/plan.js
+++ b/src/main/webapp/static/js/plan/plan.js
@@ -477,7 +477,7 @@
}, function (i) {
layer.close(i);
// 鎸囧畾瑙勫垝鍛�
- if (data.settle === 2) {
+ if (data.settle === 1) {
admin.open({
type: 1,
area: '300px',
--
Gitblit v1.9.1