From 8346fe7b99e1d9f63f4f7557e321c1da854bf518 Mon Sep 17 00:00:00 2001
From: Renpc-kilig <308442850@qq.com>
Date: Thu, 2 Jan 2025 16:51:23 +0800
Subject: [PATCH] =?UTF-8?q?=E9=97=A8=E6=88=B7=E5=90=8E=E5=8F=B0-=E5=8D=8F?=
 =?UTF-8?q?=E8=AE=AE=E7=AE=A1=E7=90=86=E5=8A=9F=E8=83=BD=E5=AE=8C=E5=96=84?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../impl/AgreementPortalServiceImpl.java      | 10 ++++++++--
 .../templates/agreementportal/list.html       | 20 ++++++++++++++++++-
 .../templates/agreementportal/update.html     |  7 ++++++-
 3 files changed, 33 insertions(+), 4 deletions(-)

diff --git a/src/main/java/cn/com/tenlion/operator/service/agreementportal/impl/AgreementPortalServiceImpl.java b/src/main/java/cn/com/tenlion/operator/service/agreementportal/impl/AgreementPortalServiceImpl.java
index eb44af8..64966e0 100644
--- a/src/main/java/cn/com/tenlion/operator/service/agreementportal/impl/AgreementPortalServiceImpl.java
+++ b/src/main/java/cn/com/tenlion/operator/service/agreementportal/impl/AgreementPortalServiceImpl.java
@@ -116,6 +116,7 @@ public class AgreementPortalServiceImpl extends DefaultBaseService implements IA
         } else {
             setAppUpdateInfo(token, params);
         }
+
         // 查询此类型是否已经有数据
         // 如果有，则版本号+1
         Object o = params.get("sendStatus");
@@ -126,9 +127,14 @@ public class AgreementPortalServiceImpl extends DefaultBaseService implements IA
             Optional<AgreementPortalDTO> max = list.stream()
                     .max(Comparator.comparingDouble(AgreementPortalDTO::getVersionNum));
             params.put("versionNum", max.get().getVersionNum() + 1);
+            params.put("sendStatus", o);
+
+            if(!o.equals("save")) {
+                save(agreementVO);
+            }else {
+                agreementDao.update(params);
+            }
         }
-        params.put("sendStatus", o);
-        agreementDao.update(params);
     }
 
     @Override
diff --git a/src/main/resources/templates/agreementportal/list.html b/src/main/resources/templates/agreementportal/list.html
index 9e2f1f4..f74e9ec 100644
--- a/src/main/resources/templates/agreementportal/list.html
+++ b/src/main/resources/templates/agreementportal/list.html
@@ -273,7 +273,7 @@
                     }
                 });
             } else if(layEvent === 'updateEvent') {
-                if(checkDatas.length === 0) {
+                /*if(checkDatas.length === 0) {
                     top.dialog.msg(top.dataMessage.table.selectEdit);
                 } else if(checkDatas.length > 1) {
                     top.dialog.msg(top.dataMessage.table.selectOneEdit);
@@ -292,6 +292,24 @@
                             reloadTable();
                         }
                     });
+                }*/
+                if(checkDatas.length === 0) {
+                    top.dialog.msg(top.dataMessage.table.selectEdit);
+                } else if(checkDatas.length > 1) {
+                    top.dialog.msg(top.dataMessage.table.selectOneEdit);
+                }else {
+                    layer.open({
+                        type: 2,
+                        title: false,
+                        closeBtn: 0,
+                        area: ['100%', '100%'],
+                        shadeClose: true,
+                        anim: 2,
+                        content: top.restAjax.path('route/agreementportal/update?agreementId={agreementId}', [checkDatas[0].agreementId]),
+                        end: function() {
+                            reloadTable();
+                        }
+                    });
                 }
             } else if(layEvent === 'removeEvent') {
                 if(checkDatas.length === 0) {
diff --git a/src/main/resources/templates/agreementportal/update.html b/src/main/resources/templates/agreementportal/update.html
index 1e6529c..e8cd152 100644
--- a/src/main/resources/templates/agreementportal/update.html
+++ b/src/main/resources/templates/agreementportal/update.html
@@ -55,7 +55,7 @@
                 <div class="layui-form-item layui-layout-admin">
                     <div class="layui-input-block">
                         <div class="layui-footer" style="left: 0;">
-                            <button type="button" class="layui-btn" lay-submit lay-filter="saveForm">保存</button>
+                            <button type="button" class="layui-btn" id="saveBtn" lay-submit lay-filter="saveForm">保存</button>
                             <button type="button" class="layui-btn" lay-submit lay-filter="submitForm">发布</button>
                             <button type="button" class="layui-btn layui-btn-primary close">返回上级</button>
                         </div>
@@ -144,6 +144,11 @@
                 }
                 form.val('dataForm', dataFormData);
                 form.render(null, 'dataForm');
+
+                if('save' != data['sendStatus']) {
+                    $('#saveBtn').attr('disabled', 'disabled');
+                }
+
                 initContentRichText(data['content']);
                 initagreementportalTypeSelect(data['agreementType']);
                 // 设置开关值