bug修改

src/main/java/cn/com/tenlion/operator/controller/api/content/ContentController.java

@@ -113,7 +113,7 @@ public class ContentController extends DefaultBaseController {
             @ApiImplicitParam(name = "contentId", value = "内容主体表ID", paramType = "path")
     })
     @ApiResponses({@ApiResponse(code = 400, message = "请求失败", response = ErrorResult.class)})
-    @GetMapping("cancel/{contentId}")
+    @PutMapping("cancel/{contentId}")
     public SuccessResult cancel(@PathVariable("contentId") String contentId) {
         contentService.cancel(contentId);
         return new SuccessResult();

src/main/java/cn/com/tenlion/operator/service/news/impl/NewsServiceImpl.java

@@ -1,6 +1,7 @@
 package cn.com.tenlion.operator.service.news.impl;
 
 import ink.wgink.common.base.DefaultBaseService;
+import ink.wgink.module.dictionary.pojo.dtos.DataDTO;
 import ink.wgink.module.dictionary.service.IDataService;
 import ink.wgink.pojo.ListPage;
 import ink.wgink.pojo.result.SuccessResult;
@@ -146,7 +147,10 @@ public class NewsServiceImpl extends DefaultBaseService implements INewsService
     public List<NewsDTO> list(Map<String, Object> params) {
         List<NewsDTO> list = newsDao.list(params);
         for (NewsDTO newsDTO : list) {
-            newsDTO.setNewsTypeName(dataService.get(newsDTO.getNewsType()).getDataName());
+            DataDTO dataDTO = dataService.get(newsDTO.getNewsType());
+            if (null != dataDTO) {
+                newsDTO.setNewsTypeName(dataDTO.getDataName());
+            }
             if (StringUtils.isNotEmpty(newsDTO.getPublishTime())) {
                 newsDTO.setPublishTimeSub1(newsDTO.getPublishTime().substring(0, 7));
                 newsDTO.setPublishTimeSub2(newsDTO.getPublishTime().substring(8));

src/main/resources/templates/agreementportal/list.html

@@ -241,7 +241,7 @@
                         area: ['100%', '100%'],
                         shadeClose: true,
                         anim: 2,
-                        content: top.restAjax.path('route/agreementportal/update?agreementportalId={agreementportalId}', [checkDatas[0].agreementportalId]),
+                        content: top.restAjax.path('route/agreementportal/update?agreementId={agreementId}', [checkDatas[0].agreementId]),
                         end: function() {
                             reloadTable();
                         }

src/main/resources/templates/agreementportal/update.html

@@ -77,7 +77,7 @@
         var form = layui.form;
         var laytpl = layui.laytpl;
         var laydate = layui.laydate;
-        var agreementportalId = top.restAjax.params(window.location.href).agreementportalId;
+        var agreementId = top.restAjax.params(window.location.href).agreementId;
 
         var wangEditor = window.wangEditor;
         var wangEditorObj = {};
@@ -90,7 +90,7 @@
                 form.render('select', 'agreementportalTypeSelectTemplateBox');
 
                 var selectObj = {};
-                selectObj['agreementportalType'] = selectValue;
+                selectObj['agreementType'] = selectValue;
                 form.val('dataForm', selectObj);
             }, function(code, data) {
                 top.dialog.msg(data.msg);
@@ -137,7 +137,7 @@
         // 初始化内容
         function initData() {
             var loadLayerIndex;
-            top.restAjax.get(top.restAjax.path('api/agreementportal/get/{agreementportalId}', [agreementportalId]), {}, null, function(code, data) {
+            top.restAjax.get(top.restAjax.path('api/agreementportal/get/{agreementId}', [agreementId]), {}, null, function(code, data) {
                 var dataFormData = {};
                 for(var i in data) {
                     dataFormData[i] = data[i] +'';
@@ -145,7 +145,7 @@
                 form.val('dataForm', dataFormData);
                 form.render(null, 'dataForm');
                 initContentRichText(data['content']);
-                initagreementportalTypeSelect(data['agreementportalType']);
+                initagreementportalTypeSelect(data['agreementType']);
                 // 设置开关值
                 /*if('1' == data['isOpen']) {
                     $('#isOpenSwitch').prop("checked", true)

src/main/resources/templates/content/list.html

@@ -164,7 +164,8 @@
             top.dialog.confirm(top.dataMessage.commit, function(index) {
                 top.dialog.close(index);
                 var loadLayerIndex;
-                top.restAjax.get(top.restAjax.path('api/content/cancel/{contentId}', [insertData.contentId]), null, null, function(code, data) {
+                top.restAjax.put(top.restAjax.path('api/content/cancel/{contentId}', [insertData.contentId]), null, null, function(code, data) {
+                    top.dialog.msg('取消发布成功');
                     reloadTable();
                 }, function(code, data) {
                     top.dialog.msg(data.msg);