paixu

zxkf-api/src/main/java/api/controller/online/MessageController.java

@@ -56,7 +56,7 @@ public class MessageController extends BaseController {
         qw.like(!StringHelper.isEmpty(input.getMsgFormat()), Message::getMsgFormat, input.getMsgFormat());
         qw.eq(input.getStatus() != null && input.getStatus() > 0, Message::getStatus, input.getStatus());
         qw.like(!StringHelper.isEmpty(input.getRemark()), Message::getRemark, input.getRemark());
-        qw.orderByDesc(Message::getCreateTime);
+//        qw.orderByDesc(Message::getCreateTime);
 
         Page<Message> page = GetPage(pageInput);
         if (page != null) {

zxkf-api/src/main/java/api/controller/order/WorkOrderBaseController.java

@@ -341,9 +341,9 @@ public class WorkOrderBaseController extends BaseController {
             User user = userMapper.selectUserByUserName(orderBase.getCreateuser());
             ov.setCreateusername(user.getNickName());
         }
-        if (orderBase.getWorkordercate() == 0) {
+        if (orderBase.getWorkorderstate() == 0) {
             ov.setWorkorderstatename("待处理");
-        } else if (orderBase.getWorkordercate() == 1) {
+        } else if (orderBase.getWorkorderstate() == 1) {
             ov.setWorkorderstatename("已完成");
         } else {
             ov.setWorkorderstatename("");