111

src/main/java/com/yunzhi/marketing/base/BaseController.java

@@ -108,6 +108,17 @@ public class BaseController {
         return null;
     }
 
+    /**
+     * 获取组织机构id
+     *
+     * @param request
+     * @return
+     */
+    public String getInstitutionId(HttpServletRequest request) {
+        TaUser taUser = taUserService.getById(getUserId(request));
+        return taUser.getInstitutionId();
+    }
+
     /**
      * 获取服务管理后台用户ID
      *

src/main/java/com/yunzhi/marketing/controller/TaBuildingDynamicController.java

@@ -459,7 +459,7 @@ public class TaBuildingDynamicController extends BaseController {
 //        }
         dynamic.setPublishDate(LocalDateTime.now());
         dynamic.setCreateDate(LocalDateTime.now());
-
+        dynamic.setInstitutionId(getInstitutionId(request));
         //判断报名时间是否在活动时间之内
         if (dynamic.getEndDate().isBefore(dynamic.getEnlistEnd())){
             responseBean.addError("报名时间应在活动结束时间之前");

src/main/java/com/yunzhi/marketing/controller/TaLiveActivityController.java

@@ -103,6 +103,7 @@ public class TaLiveActivityController extends BaseController {
             taLiveActivity.setOrgId(orgId);
             taLiveActivity.setCreateUser(userId.toString());
             taLiveActivity.setUpdateUser(userId.toString());
+            taLiveActivity.setInstitutionId(getInstitutionId(request));
             responseBean = iTaLiveActivityService.taLiveActivityAdd(taLiveActivity);
         } catch (Exception e) {
             e.printStackTrace();

src/main/java/com/yunzhi/marketing/controller/TaNewsController.java

@@ -129,6 +129,7 @@ public class TaNewsController extends BaseController {
         Integer cityId = iTaBuildingService.getCityById(taNews.getBuildingId());
         taNews.setCityId(cityId);
         taNews.setOrgId(getOrgId(request));
+        taNews.setInstitutionId(getInstitutionId(request));
         ResponseBean responseBean = iTaNewsService.addTaNews(taNews);
         return responseBean;
     }

src/main/java/com/yunzhi/marketing/controller/TaNewsTypeController.java

@@ -72,6 +72,7 @@ public class TaNewsTypeController extends BaseController {
     })
     @RequestMapping(value="/admin/taNewsType",method= RequestMethod.POST)
     public ResponseBean taNewsTypeAdd(@RequestBody TaNewsType taNewsType, HttpServletRequest request){
+        taNewsType.setInstitutionId(getInstitutionId(request));
         ResponseBean responseBean = iTaNewsTypeService.addTaNewsType(taNewsType, getOrgId(request));
         return responseBean;
     }

src/main/java/com/yunzhi/marketing/controller/TaPolicyController.java

@@ -167,7 +167,7 @@ public class TaPolicyController extends BaseController {
             taPolicy.setStatus(1);
             taPolicy.setCreateDate(LocalDateTime.now());
             taPolicy.setOrgId(getOrgId(request));
-
+            taPolicy.setInstitutionId(getInstitutionId(request));
             if (iTaPolicyService.save(taPolicy)){
                 responseBean.addSuccess(taPolicy);
             }else {

src/main/java/com/yunzhi/marketing/entity/TaPolicy.java

@@ -119,4 +119,9 @@ public class TaPolicy implements Serializable {
      * 副标题
      */
     private String subtitle;
+
+    /**
+     * 组织机构code
+     */
+    private String institutionId;
 }

src/main/java/com/yunzhi/marketing/xlk/controller/TaPolicyTypeController.java

@@ -88,6 +88,7 @@ public class TaPolicyTypeController extends BaseController {
         try {
             taPolicyType.setOrgId(getOrgId(request));
             taPolicyType.setCreateDate(LocalDateTime.now());
+            taPolicyType.setInstitutionId(getInstitutionId(request));
             if (iTaPolicyTypeService.save(taPolicyType)){
                 responseBean.addSuccess(taPolicyType);
             }else {

src/main/java/com/yunzhi/marketing/xlk/controller/VideoController.java

@@ -112,6 +112,7 @@ public class VideoController extends BaseController {
             video.setCreatedTime(LocalDateTime.now());
             video.setCreatedBy(getUserId(request));
             video.setOrgId(getOrgId(request));
+            video.setInstitutionId(getInstitutionId(request));
             if (iVideoService.save(video)){
                 responseBean.addSuccess(video);
             }else {

src/main/java/com/yunzhi/marketing/xlk/entity/TaPolicyType.java

@@ -56,4 +56,9 @@ public class TaPolicyType implements Serializable {
     /** 颜色 */
     private String color ;
 
+    /**
+     * 组织机构code
+     */
+    private String institutionId;
+
 }

src/main/java/com/yunzhi/marketing/xlk/entity/Video.java

@@ -122,4 +122,9 @@ public class Video implements Serializable {
      * 是否新房
      */
     private Boolean isNewHouse;
+
+    /**
+     * 组织机构code
+     */
+    private String institutionId;
 }

src/main/resources/mapper/xlk/PcStatisticsMapper.xml

@@ -33,7 +33,7 @@
             LEFT JOIN xlk_institution i ON t.institution_id = i.institution_id
         WHERE
             t.org_id = #{params.orgId}
-            AND i.institution_code like CONCAT(#{params.institutionCode}, '%')
+<!--            AND i.institution_code like CONCAT(#{params.institutionCode}, '%')-->
     </select>
     <select id="selectEstateAgentNum" resultType="java.lang.Integer">
         SELECT
@@ -82,7 +82,7 @@
             <if test="params.endTime != null">
                 and  TO_DAYS(b.create_date) &lt;= TO_DAYS(#{params.endTime})
             </if>
-            AND i.institution_code like CONCAT(#{params.institutionCode}, '%')
+<!--            AND i.institution_code like CONCAT(#{params.institutionCode}, '%')-->
         GROUP BY b.building_id
         ORDER BY num desc
         LIMIT 6
@@ -112,7 +112,7 @@
         <if test="params.endTime != null">
             and  TO_DAYS(b.create_date) &lt;= TO_DAYS(#{params.endTime})
         </if>
-        AND i.institution_code like CONCAT(#{params.institutionCode}, '%')
+<!--        AND i.institution_code like CONCAT(#{params.institutionCode}, '%')-->
         GROUP BY b.building_id
         ORDER BY num desc
         LIMIT 6
@@ -139,7 +139,7 @@
         <if test="params.endTime != null">
             and  TO_DAYS(a.create_date) &lt;= TO_DAYS(#{params.endTime})
         </if>
-        AND i.institution_code like CONCAT(#{params.institutionCode}, '%')
+<!--        AND i.institution_code like CONCAT(#{params.institutionCode}, '%')-->
         GROUP BY
             a.be_uv
         ORDER BY
@@ -169,7 +169,7 @@
         <if test="params.endTime != null">
             and  TO_DAYS(b.create_date) &lt;= TO_DAYS(#{params.endTime})
         </if>
-        AND i.institution_code like CONCAT(#{params.institutionCode}, '%')
+<!--        AND i.institution_code like CONCAT(#{params.institutionCode}, '%')-->
         GROUP BY b.building_id
         ORDER BY num desc
         LIMIT 6
@@ -211,7 +211,7 @@
         a.target_id
         ) v ON t.dynamic_id = v.target_id
         LEFT JOIN ( SELECT COUNT( 1 ) AS sign_num, dynamic_id FROM ta_activity_dynamic_enlist GROUP BY dynamic_id ) d ON t.dynamic_id = d.dynamic_id
-        LEFT JOIN xlk_institution i ON b.institution_id = i.institution_id
+        LEFT JOIN xlk_institution i ON t.institution_id = i.institution_id
         where
         t.org_id = #{params.orgId}
         <if test="params.startTime != null">
@@ -223,7 +223,7 @@
         <if test="params.buildingId != null and params.buildingId != ''">
             and  t.building_id = #{params.buildingId}
         </if>
-        AND i.institution_code like CONCAT(#{params.institutionCode}, '%')
+<!--        AND i.institution_code like CONCAT(#{params.institutionCode}, '%')-->
         order by t.create_date desc
     </select>
 </mapper>