Merge branch 'v3' of http://git.ycjcjy.com/zhiyuxing/estateagents into v3

src/main/java/com/huiju/estateagents/controller/TaPersonVisitRecordController.java

@@ -97,6 +97,7 @@ public class TaPersonVisitRecordController extends BaseController {
             taEventProperty.setStatus(CommConstant.STATUS_NORMAL);
             taEventProperty.setBuildingId(taPersonVisitRecord.getBuildingId());
             taEventProperty.setEventType(taPersonVisitRecord.getEventType());
+            taEventProperty.setOrgId(getOrgId(request));
             if (!taEventPropertiesService.save(taEventProperty)){
                 return ResponseBean.error("新增失败",ResponseBean.ERROR_UNAVAILABLE);
             }
@@ -121,6 +122,7 @@ public class TaPersonVisitRecordController extends BaseController {
                 intentionRecord.setEventId(buildingIntention.getEventId());
                 intentionRecord.setEventName(buildingIntention.getEventName());
                 intentionRecord.setIntention(buildingIntention.getIntention());
+                intentionRecord.setOrgId(getOrgId(request));
                 intentionRecord.setPersonId(person.getPersonId());
                 intentionRecord.setPersonName(person.getNickname());
                 intentionRecord.setStatus(CommConstant.STATUS_NORMAL);

src/main/java/com/huiju/estateagents/controller/TaSaveController.java

@@ -36,7 +36,7 @@ public class TaSaveController extends BaseController {
     public ResponseBean giveFavor(@PathVariable String typeOf, @PathVariable String id, HttpServletRequest request) {
         String openid = getOpenId(request);
 
-        return iTaSaveService.postLike(openid, typeOf, id);
+        return iTaSaveService.postLike(openid, typeOf, id,getOrgId(request));
     }
 
     /**

src/main/java/com/huiju/estateagents/service/ITaSaveService.java

@@ -17,7 +17,7 @@ import java.util.List;
 public interface ITaSaveService extends IService<TaSave> {
 
 
-    ResponseBean postLike(String openid, String typeOf, String like);
+    ResponseBean postLike(String openid, String typeOf, String like,Integer orgId);
 
     ResponseBean cancelLike(String openid, String typeOf, String like);
 

src/main/java/com/huiju/estateagents/service/impl/TaSaveServiceImpl.java

@@ -45,7 +45,7 @@ public class TaSaveServiceImpl extends ServiceImpl<TaSaveMapper, TaSave> impleme
     private TaBuildingDynamicMapper taBuildingDynamicMapper;
 
     @Override
-    public ResponseBean postLike(String openid, String typeOf, String like) {
+    public ResponseBean postLike(String openid, String typeOf, String like,Integer orgId) {
         List<TaPerson> persons = getPersonsByOpenId(openid);
         if (null == persons || persons.size() != 1) {
             return ResponseBean.error("验证当前人员信息失败", ResponseBean.ERROR_UNAVAILABLE);
@@ -71,6 +71,7 @@ public class TaSaveServiceImpl extends ServiceImpl<TaSaveMapper, TaSave> impleme
         taSave.setNameOrnick(taPerson.getNickname());
         taSave.setPersonId(taPerson.getPersonId());
         taSave.setPhotoOravatar(taPerson.getAvatarurl());
+        taSave.setOrgId(orgId);
         taSave.setTagertType(typeOf);
 
         int row = taSaveMapper.insert(taSave);