合并

src/main/java/com/huiju/estateagents/base/UserControl.java

@@ -0,0 +1,38 @@
+package com.huiju.estateagents.base;
+
+import com.huiju.estateagents.center.taUser.entity.TaUser;
+import com.huiju.estateagents.exception.EstaException;
+import org.springframework.web.context.request.RequestContextHolder;
+import org.springframework.web.context.request.ServletRequestAttributes;
+
+import javax.servlet.http.HttpSession;
+
+/**
+ * 用户控制
+ */
+public class UserControl {
+
+    /**
+     * 获取用户信息
+     * @return
+     */
+    public static TaUser getUser() {
+        ServletRequestAttributes servletRequestAttributes = (ServletRequestAttributes)RequestContextHolder.getRequestAttributes();
+        HttpSession session = servletRequestAttributes.getRequest().getSession();
+        TaUser taUser = (TaUser) session.getAttribute("miniapp_user");
+        if (null == taUser) {
+            throw new EstaException("用户信息不存在, 请登录!");
+        }
+        return taUser;
+    }
+
+    /**
+     * 获取公司 org_id
+     * @return
+     */
+    public static Integer getOrgId() {
+        TaUser user = getUser();
+        return user.getOrgId();
+    }
+
+}

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

@@ -57,7 +57,7 @@ public class TaBuildingController extends BaseController {
     }
 
     /**
-     * 楼盘列表
+     * 楼盘列表 查询所有有效的
      * @param pageNum
      * @param pageSize
      * @param name

src/main/java/com/huiju/estateagents/entity/TaBuilding.java

@@ -183,6 +183,12 @@ public class TaBuilding implements Serializable {
     private Integer saveNum;
     private Integer shareNum;
 
+    /**
+     * 公司Id
+     */
+    private Integer orgId;
+
+
 
     /**
      * 图片

src/main/java/com/huiju/estateagents/entity/TaBuildingDynamic.java

@@ -176,4 +176,9 @@ public class TaBuildingDynamic implements Serializable {
     private Integer enlistNum;
 
     private Integer weight;
+
+    /**
+     * 公司Id
+     */
+    private Integer orgId;
 }

src/main/java/com/huiju/estateagents/entity/TaChat.java

@@ -79,5 +79,10 @@ public class TaChat implements Serializable {
      */
     private String messageType;
 
+    /**
+     * 公司Id
+     */
+    private Integer orgId;
+
 
 }

src/main/java/com/huiju/estateagents/entity/TaCheckin.java

@@ -64,4 +64,9 @@ public class TaCheckin implements Serializable {
      */
     private String activityName;
 
+    /**
+     * 公司Id
+     */
+    private Integer orgId;
+
 }

src/main/java/com/huiju/estateagents/entity/TaPersonPoints.java

@@ -54,5 +54,9 @@ public class TaPersonPoints implements Serializable {
      */
     private LocalDateTime createDate;
 
+    /**
+     * 公司Id
+     */
+    private Integer orgId;
 
 }