From 9ac32fe3ff1b958a747420e035f300f90863b518 Mon Sep 17 00:00:00 2001
From: DuanDongmei <DuanDongmei@192.168.11.156>
Date: Sat, 8 Dec 2018 18:37:14 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9app=5Ftopic=5Fdomain=E8=87=AA?=
 =?UTF-8?q?=E5=AE=9A=E4=B9=89=E5=9F=9F=E7=9A=84id=E4=B8=BAWEB=5FID;?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/nis/web/service/configuration/AppCfgService.java    | 2 +-
 src/main/resources/service/service_config.xml               | 2 +-
 .../resources/sql/20181208/update_statistics_table_data.sql | 1 +
 .../webapp/WEB-INF/views/cfg/app/appTopicDomainCfgForm.jsp  | 6 +++---
 4 files changed, 6 insertions(+), 5 deletions(-)
 create mode 100644 src/main/resources/sql/20181208/update_statistics_table_data.sql

diff --git a/src/main/java/com/nis/web/service/configuration/AppCfgService.java b/src/main/java/com/nis/web/service/configuration/AppCfgService.java
index a6ca98acc..ceeaeca87 100644
--- a/src/main/java/com/nis/web/service/configuration/AppCfgService.java
+++ b/src/main/java/com/nis/web/service/configuration/AppCfgService.java
@@ -1483,7 +1483,7 @@ public class AppCfgService extends BaseService {
 			List<WebsiteDomainTopic> domainDict = appCfgDao.getDomainDict(websiteDomainTopic);
 			Long domainId = domainDict.get(0).getId();
 			// "APP_ID="+entity.getAppCode()+Constants.USER_REGION_SPLIT+
-			String userRegion = "DOMAIN_ID=" + domainId /*+ Constants.USER_REGION_SPLIT + "DOMAIN_STR="
+			String userRegion = "WEB_ID=" + domainId /*+ Constants.USER_REGION_SPLIT + "DOMAIN_STR="
 					+ keywordsEscape(entity.getDomain())*/;
 
 			maatCfg.setUserRegion(userRegion);
diff --git a/src/main/resources/service/service_config.xml b/src/main/resources/service/service_config.xml
index 26b0fdd12..e18c4a3b7 100644
--- a/src/main/resources/service/service_config.xml
+++ b/src/main/resources/service/service_config.xml
@@ -361,7 +361,7 @@
 		</service> 
 	-->
 	<service id="1152" functionId="560" serviceType="1" cfgType="2" tableName="app_topic_domain_cfg" className="AppTopicDomainCfg"  desc="关注话题域名">
-    	<userRegion regionKey="DOMAIN_ID" regionColumn="compileId"  userRegionPosition="0"></userRegion>
+    	<userRegion regionKey="WEB_ID" regionColumn="compileId"  userRegionPosition="0"></userRegion>
 	</service>
 	<!-- APP、基础协议、 加密协议行为配置结束-->
 	
diff --git a/src/main/resources/sql/20181208/update_statistics_table_data.sql b/src/main/resources/sql/20181208/update_statistics_table_data.sql
new file mode 100644
index 000000000..e9f369582
--- /dev/null
+++ b/src/main/resources/sql/20181208/update_statistics_table_data.sql
@@ -0,0 +1 @@
+update statistics_tables set is_valid=0 where id in(4,7);
\ No newline at end of file
diff --git a/src/main/webapp/WEB-INF/views/cfg/app/appTopicDomainCfgForm.jsp b/src/main/webapp/WEB-INF/views/cfg/app/appTopicDomainCfgForm.jsp
index 0a10a54f0..6c133ecd1 100644
--- a/src/main/webapp/WEB-INF/views/cfg/app/appTopicDomainCfgForm.jsp
+++ b/src/main/webapp/WEB-INF/views/cfg/app/appTopicDomainCfgForm.jsp
@@ -107,11 +107,11 @@ $(function(){
 						+'<option value=""><spring:message code="select"/></option>';
 					if(data.length>0){
 							for(i=0;i<data.length;i++){
-								html+='<option value="'+data[i].cfgKeywords+'"';
-								if('${_cfg.cfgKeywords}'==data[i].cfgKeywords){
+								html+='<option value="'+data[i].domain+'"';
+								if('${_cfg.cfgKeywords}'==data[i].domain){
 									html+=" selected";
 								}
-								html+='>'+data[i].cfgKeywords+'</option>';
+								html+='>'+data[i].domain+'</option>';
 		      			   	}
 							html+='</select>';
 							$("#selectDomain").html(html);