合并

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

@@ -168,10 +168,13 @@ public class TicketController extends BaseController {
     @ApiOperation(value = "物业，门卫，领导电话", notes = "物业，门卫，领导电话")
     @RequestMapping(value = "/allTpAnnouncementTel", method = RequestMethod.GET)
     @ApiImplicitParams({
+            @ApiImplicitParam(paramType = "query",dataTypeClass = Integer.class,name = "communityId", value = "小区编号"),
             @ApiImplicitParam(paramType = "header",dataType = "String",name = "X-Auth-Token",value = "Token")
     })
-    public ResponseBean getTpAnnouncementTel(HttpSession session) {
+    public ResponseBean getTpAnnouncementTel(HttpSession session,
+                                             @RequestParam(value = "communityId",required = false) Integer communityId) {
         UserElement userElement = getUserElement(session);
+        userElement.setCommunityId(userElement.getCommunityId() == null?communityId:userElement.getCommunityId());
         ResponseBean agreement = agreementServicel.getTpAnnouncementTel(userElement);
         return agreement;
     }

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

@@ -339,7 +339,7 @@ public class UserController extends BaseController {
 
     }
 
-    @ApiOperation(value = "联系电话", notes = "联系电话")
+    @ApiOperation(value = "运营联系电话", notes = "运营联系电话")
     @RequestMapping(value = "/user/operatetel",method = RequestMethod.GET)
     public ResponseBean operatetel(){
         ResponseBean response = new ResponseBean();

CODE/smart-community/app-api/src/main/java/com/community/huiju/dao/TpMessageMapper.java

@@ -45,7 +45,7 @@ public interface TpMessageMapper {
     /**
      * 查询工单id是否为空
      */
-    Integer selectTicket(@Param(value = "communityId") Integer ticketId);
+    Integer selectTicket(@Param(value = "ticketId") Integer ticketId);
 
     /**
      * 根据条件查询消息