合并

CODE/smart-community/app-api/src/main/java/com/community/huiju/controller/TicketController.java

@@ -116,7 +116,7 @@ public class TicketController extends BaseController {
 
         TpTicket tpTicket = new TpTicket();
         tpTicket.setCommunityId(Integer.valueOf(communityId));
-        tpTicket.setTaUserId(userElement.getId());
+        tpTicket.setTaUserId(userElement.getUserVerifyId());
         tpTicket.setType(type);
 
         responseBean = iTicketService.getByTypeList(tpTicket, pageNum, pageSize);

CODE/smart-community/property-api/src/main/java/com/community/huiju/service/impl/TpTicketServiceImpl.java

@@ -204,7 +204,7 @@ public class TpTicketServiceImpl extends ServiceImpl<TpTicketMapper, TpTicket> i
         //1.5维护工单对话推送到app消息
         Message message = new Message();
         message.setCommunityId(communityId);
-        message.setMessageType("10");
+        message.setMessageType(tpTicket.getType());
         message.setTicketId(tpTicket.getId());
         message.setAdviceType("1");
         message.setUuid(tpTicket.getCreateUser());