'/wx/taPersonVisitRecord增加orgId'

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

@@ -87,7 +87,7 @@ public class TaPersonVisitRecordController extends BaseController {
         }
         TaPerson person = taPersons.get(0);
         taPersonVisitRecord.setActivity(taPersonVisitRecord.getPropertyName());
-        Integer eventProperties = taEventPropertiesService.isEventExist(taPersonVisitRecord.getTargetId(),taPersonVisitRecord.getEventType(),taPersonVisitRecord.getActivity());
+        Integer eventProperties = taEventPropertiesService.isEventExist(taPersonVisitRecord.getTargetId(),taPersonVisitRecord.getEventType(),taPersonVisitRecord.getActivity(), getOrgId(request));
         if(eventProperties<=0){
             TaEventProperties taEventProperty = new TaEventProperties();
             taEventProperty.setBuildingId(taPersonVisitRecord.getTargetId());
@@ -109,6 +109,7 @@ public class TaPersonVisitRecordController extends BaseController {
         if(!StringUtils.isEmpty(taPersonVisitRecord.getBuildingId())){
             QueryWrapper<TaBuildingIntention> intentionQueryWrapper = new QueryWrapper<>();
             intentionQueryWrapper.eq("building_id",taPersonVisitRecord.getBuildingId());
+            intentionQueryWrapper.eq("org_id", getOrgId(request));
             intentionQueryWrapper.eq("event_code",taPersonVisitRecord.getEvent());
             List<TaBuildingIntention>list = buildingIntentionService.list(intentionQueryWrapper);
             if (list.size()>0){

src/main/java/com/huiju/estateagents/mapper/TaEventPropertiesMapper.java

@@ -17,6 +17,6 @@ import org.apache.ibatis.annotations.Param;
 @Mapper
 public interface TaEventPropertiesMapper extends BaseMapper<TaEventProperties> {
 
-    Integer isEventExist(@Param("targetId") String targetId, @Param("eventType") String eventType, @Param("activity") String activity);
+    Integer isEventExist(@Param("targetId") String targetId, @Param("eventType") String eventType, @Param("activity") String activity, @Param("orgId") Integer orgId);
 
 }

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

@@ -14,6 +14,6 @@ import com.huiju.estateagents.entity.TaEventProperties;
  */
 public interface ITaEventPropertiesService extends IService<TaEventProperties> {
 
-    Integer isEventExist(String targetId,String eventType,String activity);
+    Integer isEventExist(String targetId,String eventType,String activity, Integer orgId);
 
 }

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

@@ -22,8 +22,8 @@ public class TaEventPropertiesServiceImpl extends ServiceImpl<TaEventPropertiesM
     TaEventPropertiesMapper taEventPropertiesMapper;
 
     @Override
-    public Integer isEventExist(String targetId,String eventType,String activity){
-        return taEventPropertiesMapper.isEventExist(targetId,eventType,activity);
+    public Integer isEventExist(String targetId,String eventType,String activity, Integer orgId){
+        return taEventPropertiesMapper.isEventExist(targetId,eventType,activity, orgId);
     }
 
 }

src/main/resources/mapper/TaEventPropertiesMapper.xml

@@ -3,13 +3,17 @@
 <mapper namespace="com.huiju.estateagents.mapper.TaEventPropertiesMapper">
     <select id="isEventExist" resultType="java.lang.Integer">
         SELECT
-	COUNT(1)
-FROM
-	ta_event_properties t
-WHERE
-	( ( t.target_id IS NULL AND #{targetId} IS NULL ) OR t.target_id	= #{targetId} )
-	AND ( ( t.event_type IS NULL AND #{eventType} IS NULL ) OR t.event_type = #{eventType} )
-	AND ( ( t.property_code IS NULL AND #{activity} IS NULL ) OR t.property_code = #{activity} )
+			COUNT(1)
+		FROM
+			ta_event_properties t
+		WHERE
+			( ( t.target_id IS NULL AND #{targetId} IS NULL ) OR t.target_id	= #{targetId} )
+			AND ( ( t.event_type IS NULL AND #{eventType} IS NULL ) OR t.event_type = #{eventType} )
+			AND ( ( t.property_code IS NULL AND #{activity} IS NULL ) OR t.property_code = #{activity} )
+			<if test="orgId != null">
+				and t.org_id = #{orgId}
+			</if>
+
     </select>
 
 </mapper>