diff --git a/pom.xml b/pom.xml
index 27c1005d..a02173a9 100644
--- a/pom.xml
+++ b/pom.xml
@@ -3,9 +3,9 @@
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
- org.springframework.boot
- spring-boot-starter-parent
- 2.2.2.RELEASE
+ net.mingsoft
+ ms-pom
+ 2.0.0-SNAPSHOT
4.0.0
net.mingsoft
@@ -35,7 +35,6 @@
net.mingsoft
ms-mpeople
- 1.0.28
diff --git a/src/main/webapp/WEB-INF/manager/cms/category/form.ftl b/src/main/webapp/WEB-INF/manager/cms/category/form.ftl
index 8ac9c7fc..67685eea 100644
--- a/src/main/webapp/WEB-INF/manager/cms/category/form.ftl
+++ b/src/main/webapp/WEB-INF/manager/cms/category/form.ftl
@@ -418,7 +418,9 @@
ms.http.get(ms.manager + "/mdiy/model/list.do", {
modelType: 'zdymx_wz'
}).then(function (data) {
- that.mdiyModelIdOptions = data.data.rows;
+ if(data.result){
+ that.mdiyModelIdOptions = data.data.rows;
+ }
}).catch(function (err) {
console.log(err);
});
@@ -460,10 +462,12 @@
ms.http.post(ms.manager + "/cms/content/list.do", {
contentCategoryId: id
}).then(function (data) {
- if (data.data.total > 0) {
- that.categoryTypeDisabled = true;
- } else {
- that.categoryTypeDisabled = false;
+ if(data.result){
+ if (data.data.total > 0) {
+ that.categoryTypeDisabled = true;
+ } else {
+ that.categoryTypeDisabled = false;
+ }
}
}).catch(function (err) {
console.log(err);
@@ -494,7 +498,10 @@
dictType: '栏目属性',
pageSize: 99999
}).then(function (res) {
- that.categoryFlagOptions = res.rows;
+ if(res.result){
+ res = res.data;
+ that.categoryFlagOptions = res.rows;
+ }
}).catch(function (err) {
console.log(err);
});
diff --git a/src/main/webapp/WEB-INF/manager/cms/content/form.ftl b/src/main/webapp/WEB-INF/manager/cms/content/form.ftl
index 07362018..68661cc0 100644
--- a/src/main/webapp/WEB-INF/manager/cms/content/form.ftl
+++ b/src/main/webapp/WEB-INF/manager/cms/content/form.ftl
@@ -543,7 +543,10 @@
dictType: '文章属性',
pageSize: 99999
}).then(function (data) {
- that.contentTypeOptions = data.rows;
+ if(data.result){
+ data = data.data;
+ that.contentTypeOptions = data.rows;
+ }
}).catch(function (err) {
console.log(err);
});
diff --git a/src/main/webapp/WEB-INF/manager/cms/content/main.ftl b/src/main/webapp/WEB-INF/manager/cms/content/main.ftl
index 533cf016..e7057120 100644
--- a/src/main/webapp/WEB-INF/manager/cms/content/main.ftl
+++ b/src/main/webapp/WEB-INF/manager/cms/content/main.ftl
@@ -456,7 +456,10 @@
dictType: '文章属性',
pageSize: 99999
}).then(function (data) {
- that.contentTypeOptions = data.rows;
+ if(data.result){
+ data = data.data;
+ that.contentTypeOptions = data.rows;
+ }
}).catch(function (err) {
console.log(err);
});
diff --git a/src/main/webapp/WEB-INF/manager/index.ftl b/src/main/webapp/WEB-INF/manager/index.ftl
index c74e016d..b7946f69 100644
--- a/src/main/webapp/WEB-INF/manager/index.ftl
+++ b/src/main/webapp/WEB-INF/manager/index.ftl
@@ -507,7 +507,10 @@
dictList: function () {
var that = this;
ms.http.get(ms.base + '/mdiy/dict/list.do', {dictType: '消息类型', pageSize: 99999}).then(function (res) {
- that.messageTypeList = res.rows;
+ if(res.result){
+ res = res.data;
+ that.messageTypeList = res.rows;
+ }
}).catch(function (err) {
console.log(err);
});