qx

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

@@ -1,10 +1,13 @@
 package com.yunzhi.marketing.base;
 
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.yunzhi.marketing.center.taUser.entity.TaUser;
 import com.yunzhi.marketing.center.taUser.service.ITaUserService;
 import com.yunzhi.marketing.common.JWTUtils;
+import com.yunzhi.marketing.entity.TaBuilding;
 import com.yunzhi.marketing.entity.TaPersonBuilding;
+import com.yunzhi.marketing.service.ITaBuildingService;
 import com.yunzhi.marketing.service.ITaPersonBuildingService;
 import org.springframework.beans.factory.annotation.Autowired;
 
@@ -24,6 +27,9 @@ public class BaseController {
     @Autowired
     private ITaPersonBuildingService taPersonBuildingService;
 
+    @Autowired
+    private ITaBuildingService taBuildingService;
+
     /**
      * 获取orgId
      *
@@ -131,9 +137,21 @@ public class BaseController {
         if (taUser == null) {
             return null;
         }
+        // 个人授权条件
         QueryWrapper<TaPersonBuilding> taPersonBuildingQueryWrapper = new QueryWrapper<>();
         taPersonBuildingQueryWrapper.eq("user_id", taUser.getUserId());
         List<TaPersonBuilding> taPersonBuildingList = taPersonBuildingService.list(taPersonBuildingQueryWrapper);
+        // 新的过滤条件组织机构
+        LambdaQueryWrapper<TaBuilding> lambdaQueryWrapper = new LambdaQueryWrapper<>();
+        lambdaQueryWrapper.likeRight(TaBuilding::getInstitutionCode,taUser.getInstitutionCode());
+        List<TaBuilding> list = taBuildingService.list(lambdaQueryWrapper);
+        for (TaBuilding taBuilding: list) {
+            TaPersonBuilding taPersonBuilding = new TaPersonBuilding();
+            taPersonBuilding.setBuildingId(taBuilding.getBuildingId());
+            taPersonBuilding.setUserId(taUser.getUserId());
+            taPersonBuildingList.add(taPersonBuilding);
+        }
+
         if (null != taUser.getIsAdmin() && taUser.getIsAdmin()) {
             taPersonBuildingList = new ArrayList<>();
         }

src/main/java/com/yunzhi/marketing/config/CorsConfig.java

@@ -0,0 +1,28 @@
+package com.yunzhi.marketing.config;
+
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.web.cors.CorsConfiguration;
+import org.springframework.web.cors.UrlBasedCorsConfigurationSource;
+import org.springframework.web.filter.CorsFilter;
+
+/**
+ * 解决跨域问题
+ */
+@Configuration
+public class CorsConfig {
+    private CorsConfiguration buildConfig() {
+        CorsConfiguration corsConfiguration = new CorsConfiguration();
+        corsConfiguration.addAllowedOrigin("*"); // 1 允许任何域名使用
+        corsConfiguration.addAllowedHeader("*"); // 2 允许任何头
+        corsConfiguration.addAllowedMethod("*"); // 3 允许任何方法（post、get等）
+        return corsConfiguration;
+    }
+
+    @Bean
+    public CorsFilter corsFilter() {
+        UrlBasedCorsConfigurationSource source = new UrlBasedCorsConfigurationSource();
+        source.registerCorsConfiguration("/**", buildConfig()); // 4
+        return new CorsFilter(source);
+    }
+}

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

@@ -66,7 +66,7 @@ public class InstitutionController extends BaseController {
             }else {
                 Institution institution = iInstitutionService.getById(institutionCode);
                 queryWrapper.eq(Institution::getType,institution.getType() + 1);
-                queryWrapper.likeLeft(Institution::getInstitutionCode,institution.getInstitutionCode());
+                queryWrapper.likeRight(Institution::getInstitutionCode,institution.getInstitutionCode());
             }
             queryWrapper.orderByDesc(Institution::getCreateDate);
 

src/main/java/com/yunzhi/marketing/xlk/dto/SearchHouseDTO.java

@@ -32,11 +32,6 @@ public class SearchHouseDTO implements Serializable {
      */
     private String intentArea;
 
-    /**
-     * 意向楼盘
-     */
-    private String intentBuilding;
-
     /**
      * 总预算范围最小价格
      */
@@ -46,12 +41,6 @@ public class SearchHouseDTO implements Serializable {
      * 总预算范围最大价格
      */
     private String maxPrice;
-
-    /**
-     * 首套还是二套
-     */
-    private String houseNumber;
-
     /**
      * 0待回访，1已回访，2无效
      */
@@ -67,134 +56,14 @@ public class SearchHouseDTO implements Serializable {
      */
     private Integer type;
 
-    /**
-     * 房屋属性
-     */
-    private String houseAttribute;
-
-    /**
-     * 居室要求
-     */
-    private String housetRoomType;
-
-    /**
-     * 面积要求
-     */
-    private String houseArea;
-
-    /**
-     * 价格要求
-     */
-    private String housePrice;
-
-    /**
-     * 偏好设置
-     */
-    private String housePreference;
-
-    /**
-     * 购房目的
-     */
-    private String housePurpose;
-
-    /**
-     * 购房时间
-     */
-    private String houseTime;
-
     /**
      * 备注
      */
     private String remark;
 
     /**
-     * 租房预算
-     */
-    private String rentHouseBudget;
-
-    /**
-     * 租房居室
-     */
-    private String rentHousetRoomType;
-
-    /**
-     * 租房地址
-     */
-    private String rentHouseCity;
-
-    /**
-     * 租房要求
-     */
-    private String rentHouseDemand;
-
-    /**
-     * 海外城市
-     */
-    private String overseasHouseCity;
-
-    /**
-     * 海外房子预算
-     */
-    private String overseasHouseBudget;
-
-    /**
-     * 海外房屋类型
-     */
-    private String overseasHouseType;
-
-    /**
-     * 海外购房目的
-     */
-    private String overseasHousePurpose;
-
-    /**
-     * 装修预算
-     */
-    private String fitmentBudget;
-
-    /**
-     * 房屋现状
-     */
-    private String fitmentHousePresent;
-
-    /**
-     * 家装模式
-     */
-    private String fitmentMode;
-
-    /**
-     * 看中的家装的方面
-     */
-    private String fitmentFactor;
-
-    /**
-     * 家装风格
-     */
-    private String fitmentStyle;
-
-    /**
-     * 家装诉求
-     */
-    private String fitmentAppeal;
-
-    /**
-     * 家装特殊区域
-     */
-    private String fitmentSpecialArea;
-
-    /**
-     * 智能家居
-     */
-    private String fitmentIntelligent;
-
-    /**
-     * 租房偏好
-     */
-    private String rentHousePreference;
-
-    /**
-     * 装修面积
+     * 问卷json字符串
      */
-    private String fitmentArea;
+    private String questionnaire;
 
 }

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

@@ -67,11 +67,6 @@ public class SearchHouse implements Serializable {
      */
     private String intentArea;
 
-    /**
-     * 意向楼盘
-     */
-    private String intentBuilding;
-
     /**
      * 总预算范围最小价格
      */
@@ -82,10 +77,6 @@ public class SearchHouse implements Serializable {
      */
     private String maxPrice;
 
-    /**
-     * 首套还是二套
-     */
-    private String houseNumber;
 
     /**
      * 0待回访，1已回访，2无效
@@ -102,135 +93,8 @@ public class SearchHouse implements Serializable {
      */
     private Integer type;
 
-    /**
-     * 房屋属性
-     */
-    private String houseAttribute;
-
-    /**
-     * 居室要求
-     */
-    private String housetRoomType;
-
-    /**
-     * 面积要求
-     */
-    private String houseArea;
-
-    /**
-     * 价格要求
-     */
-    private String housePrice;
-
-    /**
-     * 偏好设置
-     */
-    private String housePreference;
-
-    /**
-     * 购房目的
-     */
-    private String housePurpose;
-
-    /**
-     * 购房时间
-     */
-    private String houseTime;
-
     /**
      * 备注
      */
     private String remark;
-
-    /**
-     * 租房预算
-     */
-    private String rentHouseBudget;
-
-    /**
-     * 租房居室
-     */
-    private String rentHousetRoomType;
-
-    /**
-     * 租房地址
-     */
-    private String rentHouseCity;
-
-    /**
-     * 租房要求
-     */
-    private String rentHouseDemand;
-
-    /**
-     * 海外城市
-     */
-    private String overseasHouseCity;
-
-    /**
-     * 海外房子预算
-     */
-    private String overseasHouseBudget;
-
-    /**
-     * 海外房屋类型
-     */
-    private String overseasHouseType;
-
-    /**
-     * 海外购房目的
-     */
-    private String overseasHousePurpose;
-
-    /**
-     * 装修预算
-     */
-    private String fitmentBudget;
-
-    /**
-     * 房屋现状
-     */
-    private String fitmentHousePresent;
-
-    /**
-     * 家装模式
-     */
-    private String fitmentMode;
-
-    /**
-     * 看中的家装的方面
-     */
-    private String fitmentFactor;
-
-    /**
-     * 家装风格
-     */
-    private String fitmentStyle;
-
-    /**
-     * 家装诉求
-     */
-    private String fitmentAppeal;
-
-    /**
-     * 家装特殊区域
-     */
-    private String fitmentSpecialArea;
-
-    /**
-     * 智能家居
-     */
-    private String fitmentIntelligent;
-
-    /**
-     * 租房偏好
-     */
-    private String rentHousePreference;
-
-    /**
-     * 装修面积
-     */
-    private String fitmentArea;
-
-
 }