From 06935c0f0d04da9dba006d9d470ce2f035bc1256 Mon Sep 17 00:00:00 2001
From: OathK1per <zhangypg@gmail.com>
Date: Wed, 7 Sep 2022 18:51:11 +0800
Subject: [PATCH] =?UTF-8?q?=E5=8F=AF=E8=A7=81=E6=80=A7=E4=BF=AE=E6=94=B9?=
 =?UTF-8?q?=EF=BC=8C=E8=B5=84=E9=87=91=E8=AE=A1=E5=88=92=E8=A1=A8=E6=A0=A1?=
 =?UTF-8?q?=E9=AA=8C=E5=8F=96=E6=B6=88?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../palmte/work/service/ProjectService.java   | 23 +++++++++++--------
 .../static/assets/js/project_budget.js        | 12 +++++-----
 .../static/assets/js/project_budget_plan.js   | 20 ++++++++--------
 3 files changed, 29 insertions(+), 26 deletions(-)

diff --git a/src/main/java/cn/palmte/work/service/ProjectService.java b/src/main/java/cn/palmte/work/service/ProjectService.java
index 8d8d32f..b12662d 100644
--- a/src/main/java/cn/palmte/work/service/ProjectService.java
+++ b/src/main/java/cn/palmte/work/service/ProjectService.java
@@ -533,21 +533,24 @@ public class ProjectService {
         for (String projectIdStr : split) {
             Integer projectId = Integer.parseInt(projectIdStr);
             //1.先清除以前的
-            List<ProjectVisible> projectVisibles = projectVisibleRepository.findAllByProjectIdEquals(projectId);
-            if(CollectionUtil.isNotEmpty(projectVisibles)){
-                projectVisibleRepository.deleteInBatch(projectVisibles);
-            }
+//            List<ProjectVisible> projectVisibles = projectVisibleRepository.findAllByProjectIdEquals(projectId);
+//            if(CollectionUtil.isNotEmpty(projectVisibles)){
+//                projectVisibleRepository.deleteInBatch(projectVisibles);
+//            }
             //2.再保存
 
             for (String s : idss) {
                 //只要用户的，角色的不要
                 if(s.startsWith(PREFIX_USER)){
-                    ProjectVisible pv = new ProjectVisible();
-                    pv.setProjectId(projectId);
-                    pv.setType(ProjectVisible.TYPE_USER);
-                    //去掉前缀
-                    pv.setTid(Integer.parseInt(s.substring(PREFIX_USER.length())));
-                    pvs.add(pv);
+                    if (projectVisibleRepository.findByProjectIdAndTypeAndTid(projectId,
+                            ProjectVisible.TYPE_USER, Integer.parseInt(s.substring(PREFIX_USER.length()))).isEmpty()) {
+                        ProjectVisible pv = new ProjectVisible();
+                        pv.setProjectId(projectId);
+                        pv.setType(ProjectVisible.TYPE_USER);
+                        //去掉前缀
+                        pv.setTid(Integer.parseInt(s.substring(PREFIX_USER.length())));
+                        pvs.add(pv);
+                    }
                 }
             }
         }
diff --git a/src/main/resources/static/assets/js/project_budget.js b/src/main/resources/static/assets/js/project_budget.js
index 1c370ed..0ce1e30 100644
--- a/src/main/resources/static/assets/js/project_budget.js
+++ b/src/main/resources/static/assets/js/project_budget.js
@@ -163,12 +163,12 @@ $(function () {
         }
 
         //校验数据正确性
-        var message = verifyBudgetPlan();
-        if (message) {
-            layuiAlert(message);
-            $("#saveDraft").attr('disabled', false);
-            return;
-        }
+        // var message = verifyBudgetPlan();
+        // if (message) {
+        //     layuiAlert(message);
+        //     $("#saveDraft").attr('disabled', false);
+        //     return;
+        // }
 
         dataPlan = prepareAjaxDataVerify(dataPlan, BUDGET_PLAN_DETAIL2, $("#id").val());
         if(dataPlan){
diff --git a/src/main/resources/static/assets/js/project_budget_plan.js b/src/main/resources/static/assets/js/project_budget_plan.js
index a90f7fa..39a31e6 100644
--- a/src/main/resources/static/assets/js/project_budget_plan.js
+++ b/src/main/resources/static/assets/js/project_budget_plan.js
@@ -86,11 +86,11 @@ $(function () {
             closeOnConfirm:false,
             onConfirm: function(e) {
                 //校验数据正确性
-                var message = verifyBudgetPlan();
-                if (message) {
-                    layuiAlert(message);
-                    return;
-                }
+                // var message = verifyBudgetPlan();
+                // if (message) {
+                //     layuiAlert(message);
+                //     return;
+                // }
                 //不能使用e.data，因为无法获取动态添加的
                 var data = collectData("am-modal-prompt-input-budget-plan-detail");
                 //data = prepareAjaxData(data, BUDGET_PLAN_DETAIL_ARR, $("#id").val(),false);
@@ -284,11 +284,11 @@ function bindMonth() {
 $(function () {
     $("#budgetPlanDetailTableSave").click(function () {
         //校验数据正确性
-        var message = verifyBudgetPlan();
-        if (message) {
-            layuiAlert(message);
-            return;
-        }
+        // var message = verifyBudgetPlan();
+        // if (message) {
+        //     layuiAlert(message);
+        //     return;
+        // }
 
         //不能使用e.data，因为无法获取动态添加的
         var data = collectData("am-modal-prompt-input-budget-plan-detail");