活动 内容 产业供地部分bug修复

src/main/java/platform/config/shiro/ShiroConfig.java

@@ -75,7 +75,8 @@ public class ShiroConfig {
         //自定义退出跳转页面
         LogoutFilter logoutFilter = new SystemLogoutFilter(logService);
         //logoutFilter.setRedirectUrl("/admin/login");
-        logoutFilter.setRedirectUrl("/home/login");
+        //logoutFilter.setRedirectUrl("/home/login");
+        logoutFilter.setRedirectUrl("/index");
         filters.put("myLogout", logoutFilter);
         filters.put("authc", new DefaultFormAuthenticationFilter(logService));
         //手机端退出登录跳转页面

src/main/java/platform/modules/government/web/ContentController.java

@@ -326,7 +326,7 @@ public class ContentController extends BaseController {
         Content content = new Content();
         content.setId(Integer.parseInt(id));
         content.setIs_top(true);
-        contentService.updateContent(content);
+        contentService.updateSelective(content);
         return ResponseMessage.success("置顶成功");
     }
 

src/main/java/platform/modules/home/web/HomeRefactorController.java

@@ -229,7 +229,11 @@ public class HomeRefactorController extends BaseController {
      * @return
      */
     @GetMapping("/activityDetail/{id}")
-    public Object activityDetail(@PathVariable Integer id, Integer user_id) {
+    public Object activityDetail(@PathVariable("id") Integer id, Integer user_id) {
+        if (user_id == null) {
+            User user = ShiroUtils.getUserEntity();
+            user_id = user.getId();
+        }
         ActivityDetail activityDetail = homeRefactorService.findByActivityId(id, user_id);
         activityDetail.setFile_url(setFileUrl());
         return ResponseMessage.success("查询成功", activityDetail);

src/main/java/platform/modules/sys/web/FileUploadController.java

@@ -139,7 +139,7 @@ public class FileUploadController extends BaseController {
     }
 
     @PostMapping(value = "/docs")
-    public ResponseEntity<String> uploadDoc(HttpServletRequest request, @RequestParam("file") MultipartFile file) throws UnsupportedEncodingException {
+    public ResponseEntity<String> uploadDoc(HttpServletRequest request, @RequestParam("file") MultipartFile file) throws IOException {
 
         if (file.isEmpty()) {
             return ResponseEntity.status(HttpStatus.INTERNAL_SERVER_ERROR).body("文件不能为空");
@@ -173,7 +173,7 @@ public class FileUploadController extends BaseController {
     	}else {
     		return ResponseEntity.status(HttpStatus.INTERNAL_SERVER_ERROR).body("上传文件错误");
     	}*/
-        try {
+//        try {
             // 写文件到磁盘
             file.transferTo(newFile);
             Attachment attachment = new Attachment();
@@ -182,10 +182,10 @@ public class FileUploadController extends BaseController {
             attachment.setDownload_uri(getFileDownloadUri());
             attachmentService.insertAndGetId(attachment);
             return ResponseEntity.status(HttpStatus.OK).body(attachment.getId().toString());
-        } catch (IOException e) {
-            log.error("上传文件错误！{}", e);
-            return ResponseEntity.status(HttpStatus.INTERNAL_SERVER_ERROR).body("上传文件错误");
-        }
+//        } catch (IOException e) {
+//            log.error("上传文件错误！{}", e);
+//            return ResponseEntity.status(HttpStatus.INTERNAL_SERVER_ERROR).body("上传文件错误");
+//        }
     }
 
     @PostMapping(value = "/uploadFile")

src/main/resources/templates/admin/government/activity_feedback/list.html

@@ -280,7 +280,8 @@
             html += '<li class="clearfix" >' +
                     '<div class="comments-info">'+list[i].content+'</div>' +
                     '<div class="activity-info" style="float: right;">'+
-                        '<p>活动名称：'+list[i].activity_title+'</p>';
+                       /* '<p>活动名称：'+list[i].activity_title+'</p>';*/
+                    '<p>'+list[i].activity_title+'</p>';
 
             if(list[i].feedback_type === 0){
             }