修改bug

src/main/java/cn/wisenergy/chnmuseum/party/web/controller/LoginController.java

@@ -12,6 +12,7 @@ import cn.wisenergy.chnmuseum.party.model.Menu;
 import cn.wisenergy.chnmuseum.party.service.RoleService;
 import cn.wisenergy.chnmuseum.party.service.impl.TUserServiceImpl;
 import cn.wisenergy.chnmuseum.party.service.impl.MenuServiceImpl;
+import cn.wisenergy.chnmuseum.party.web.controller.base.BaseController;
 import com.alibaba.fastjson.JSONObject;
 import io.swagger.annotations.Api;
 import org.apache.commons.lang3.StringUtils;
@@ -41,7 +42,7 @@ import java.util.concurrent.TimeUnit;
  */
 @Api(tags = "登录接口")
 @RestController
-public class LoginController {
+public class LoginController extends BaseController {
 
     private static final Logger LOGGER = LoggerFactory.getLogger(LoginController.class);
 
@@ -203,7 +204,8 @@ public class LoginController {
     }
 
     @RequestMapping(value = "logout", method = RequestMethod.GET)
-    public ResponseEntity<JSONObject> logout(@RequestHeader(value = "token") String token) {
+    public ResponseEntity<JSONObject> logout() {
+        String token = request.getHeader("Authorization");
         try {
             if (StringUtils.isNotBlank(token)) {
 //                SecurityUtils.getSubject().logout();
@@ -213,7 +215,7 @@ public class LoginController {
             resultMap.put("resultCode", "200");
             resultMap.put("message", "成功");
             resultMap.put("data", "");
-            return ResponseEntity.status(HttpStatus.OK).body(resultMap);
+            return ResponseEntity.ok(resultMap);
         } catch (Exception e) {
             LOGGER.error("注销错误！", e);
         }

src/main/java/cn/wisenergy/chnmuseum/party/web/controller/TInteractionController.java

@@ -152,7 +152,7 @@ public class TInteractionController extends BaseController {
     public Map<String, Object> getTInteractionPageList(String orgId) {
         Page<TInteraction> list = null;
         try {
-            list = tInteractionService.page(getPage(),new UpdateWrapper<TInteraction>().eq("organ_id", orgId));
+            list = tInteractionService.page(getPage(),new UpdateWrapper<TInteraction>().eq("organ_id", orgId).orderByDesc("create_time"));
             return getResult(list);
         } catch (Exception e) {
             e.printStackTrace();