From 3886e76bbd0c1653d7c085a20394dcd0a1e63090 Mon Sep 17 00:00:00 2001
From: Maksim <Maksim@fanruan.com>
Date: Tue, 3 Mar 2020 10:43:52 +0800
Subject: [PATCH] =?UTF-8?q?=E9=80=9A=E8=BF=87=E5=BD=93=E5=89=8D=E7=8E=AF?=
 =?UTF-8?q?=E5=A2=83=E6=9D=A5=E5=A4=84=E7=90=86=E4=B8=8D=E5=86=8D=E4=BE=9D?=
 =?UTF-8?q?=E8=B5=96=E4=BA=8E=E4=BC=A0=E5=85=A5=E5=AF=B9=E8=B1=A1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/com/fr/design/EnvChangeEntrance.java   |  2 +-
 .../design/write/submit/CheckServiceDialog.java | 17 ++++++-----------
 2 files changed, 7 insertions(+), 12 deletions(-)

diff --git a/designer-base/src/main/java/com/fr/design/EnvChangeEntrance.java b/designer-base/src/main/java/com/fr/design/EnvChangeEntrance.java
index 9a368f3429..eca98c8bea 100644
--- a/designer-base/src/main/java/com/fr/design/EnvChangeEntrance.java
+++ b/designer-base/src/main/java/com/fr/design/EnvChangeEntrance.java
@@ -244,7 +244,7 @@ public class EnvChangeEntrance {
                     textBuilder.append(descriptionOfCN).append("\n");
                 }
                 String areaText = textBuilder.toString();
-                CheckServiceDialog dialog = new CheckServiceDialog(DesignerContext.getDesignerFrame(), selectedEnv, areaText, localBranch, remoteBranch);
+                CheckServiceDialog dialog = new CheckServiceDialog(DesignerContext.getDesignerFrame(), areaText, localBranch, remoteBranch);
                 dialog.setVisible(true);
             }
         }
diff --git a/designer-base/src/main/java/com/fr/design/write/submit/CheckServiceDialog.java b/designer-base/src/main/java/com/fr/design/write/submit/CheckServiceDialog.java
index c88fa1fd99..a5f5d752b2 100644
--- a/designer-base/src/main/java/com/fr/design/write/submit/CheckServiceDialog.java
+++ b/designer-base/src/main/java/com/fr/design/write/submit/CheckServiceDialog.java
@@ -1,6 +1,6 @@
 package com.fr.design.write.submit;
 
-import com.fr.design.env.DesignerWorkspaceInfo;
+import com.fr.design.DesignerEnvManager;
 import com.fr.design.env.RemoteDesignerWorkspaceInfo;
 import com.fr.design.gui.ibutton.UIButton;
 import com.fr.design.gui.icheckbox.UICheckBox;
@@ -36,11 +36,9 @@ public class CheckServiceDialog extends JDialog implements ActionListener {
     private JPanel centerPanel;
     private JPanel bottomPanel;
     private UICheckBox remindBox;
-    private DesignerWorkspaceInfo selectEnv;
 
-    public CheckServiceDialog(Frame parent, DesignerWorkspaceInfo selectEnv, String areaText, String localBranch, String remoteBranch){
+    public CheckServiceDialog(Frame parent, String areaText, String localBranch, String remoteBranch){
         super(parent,true);
-        this.selectEnv = selectEnv;
         //上面的标签面板
         topPanel = FRGUIPaneFactory.createBorderLayout_L_Pane();
         JPanel imagePanel = new JPanel();
@@ -114,15 +112,12 @@ public class CheckServiceDialog extends JDialog implements ActionListener {
 
         @Override
         public void actionPerformed(ActionEvent e) {
-            boolean needRemind = remindBox.isSelected();
             SimpleDateFormat format = new SimpleDateFormat("yyyy-MM-dd");
             String remindTime = format.format(new Date());
-            if(needRemind){
-                //前面做过验证，一定是远程环境，直接强转
-                ((RemoteDesignerWorkspaceInfo)selectEnv).setRemindTime(remindTime);
-            }else {
-                ((RemoteDesignerWorkspaceInfo)selectEnv).setRemindTime("");
-            }
+            //环境已切换，通过当前环境获取，一定是远程环境
+            String currentEnvName = DesignerEnvManager.getEnvManager().getCurEnvName();
+            RemoteDesignerWorkspaceInfo currentEnv = (RemoteDesignerWorkspaceInfo)DesignerEnvManager.getEnvManager().getWorkspaceInfo(currentEnvName);
+            currentEnv.setRemindTime(remindBox.isSelected()? remindTime : "");
         }
     };