From a63771328350df15378a5e751eb9f41921c2e00f Mon Sep 17 00:00:00 2001
From: liuxinxin <xinxin.liu@geekforbest.com>
Date: Wed, 6 Nov 2019 16:04:10 +0800
Subject: [PATCH] =?UTF-8?q?=E3=80=90R=E3=80=91=E5=B9=BF=E5=91=8A=E4=BD=8D?=
 =?UTF-8?q?=E5=B1=8F=E8=94=BD=E5=90=8C=E8=A1=8C=E4=B8=9A=E5=95=86=E6=88=B7?=
 =?UTF-8?q?=20fix?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/main/ui/static/cms/cms.js                        | 5 +++--
 src/main/ui/static/cms/templates/article_editor.html | 2 +-
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/src/main/ui/static/cms/cms.js b/src/main/ui/static/cms/cms.js
index 31cfc7030..d3aeea811 100644
--- a/src/main/ui/static/cms/cms.js
+++ b/src/main/ui/static/cms/cms.js
@@ -365,6 +365,7 @@ define(['angular', 'uiRouter', 'static/commons/angular-ueditor'], function (angu
 
     app.controller('cmsArticleEditCtrl', ['$scope', '$http', '$state', '$stateParams', 'commonDialog', 'article', 'industryMap','stateMap',function ($scope, $http, $state, $stateParams, commonDialog, article,industryMap,stateMap) {
         $scope.article = article.data;
+        $scope.article.publishall = $scope.article.publishall +"";
 
         $scope.industries = industryMap.configs();
         $scope.states = stateMap.configs();
@@ -447,7 +448,7 @@ define(['angular', 'uiRouter', 'static/commons/angular-ueditor'], function (angu
                 $scope.toggleSelectIndustries($scope.industries[i].value)
             }
         }
-        if(!$scope.article.publishall){
+        if($scope.publishall == 1){
             $scope.selectAllIndustries();
         }
 
@@ -469,7 +470,7 @@ define(['angular', 'uiRouter', 'static/commons/angular-ueditor'], function (angu
                 $scope.toggleStates($scope.states[i].value)
             }
         }
-        if(!$scope.article.publishall){
+        if($scope.publishall == 1){
             $scope.selectAllIndustries();
         }
 
diff --git a/src/main/ui/static/cms/templates/article_editor.html b/src/main/ui/static/cms/templates/article_editor.html
index 3ecb724f2..64c185d1b 100644
--- a/src/main/ui/static/cms/templates/article_editor.html
+++ b/src/main/ui/static/cms/templates/article_editor.html
@@ -80,7 +80,7 @@
                         <label class="control-label col-sm-2">支付成功页面配置</label>
                         <div class="col-sm-8">
                             <div class="radio-inline">
-                                <input type="radio"  name="killOrder" value="1" ng-model="publishall" checked/>
+                                <input type="radio"  name="killOrder" value="1" ng-model="publishall"/>
                                 <label>全量商户推送</label>
                             </div>
                             <div class="radio-inline">