vip 5 лет назад
Родитель
Сommit
7651500038

+ 3 - 4
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">
     <parent>
-        <groupId>org.springframework.boot</groupId>
-        <artifactId>spring-boot-starter-parent</artifactId>
-        <version>2.2.2.RELEASE</version>
+        <groupId>net.mingsoft</groupId>
+        <artifactId>ms-pom</artifactId>
+        <version>2.0.0-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <groupId>net.mingsoft</groupId>
@@ -35,7 +35,6 @@
         <dependency>
             <groupId>net.mingsoft</groupId>
             <artifactId>ms-mpeople</artifactId>
-            <version>1.0.28</version>
         </dependency>
 
         <!-- 此部分是铭飞平台MStroe的客户端(MStore不在铭飞开源产品范围),如果不需要使用MStore可以删除掉 -->

+ 13 - 6
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);
                 });

+ 4 - 1
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);
                 });

+ 4 - 1
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);
                 });

+ 4 - 1
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);
                 });