x

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

@@ -9,12 +9,15 @@ 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 com.yunzhi.marketing.xlk.entity.Institution;
+import com.yunzhi.marketing.xlk.service.IInstitutionService;
 import org.springframework.beans.factory.annotation.Autowired;
 
 import javax.servlet.http.HttpServletRequest;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
+import java.util.stream.Collectors;
 
 /**
  * @author FXF
@@ -30,6 +33,9 @@ public class BaseController {
     @Autowired
     private ITaBuildingService taBuildingService;
 
+    @Autowired
+    public IInstitutionService iInstitutionService;
+
     /**
      * 获取orgId
      *
@@ -142,9 +148,14 @@ public class BaseController {
 //        taPersonBuildingQueryWrapper.eq("user_id", taUser.getUserId());
 //        List<TaPersonBuilding> taPersonBuildingList = taPersonBuildingService.list(taPersonBuildingQueryWrapper);
         List<TaPersonBuilding> taPersonBuildingList = new ArrayList<>();
+        // 获取当前人员的所有有权访问的组织机构
+        Institution institution = iInstitutionService.getById(taUser.getInstitutionId());
+        LambdaQueryWrapper<Institution> institutionLambdaQueryWrapper = new LambdaQueryWrapper<>();
+        institutionLambdaQueryWrapper.likeRight(Institution::getInstitutionCode,institution.getInstitutionCode());
+        List<Institution> institutionList = iInstitutionService.list(institutionLambdaQueryWrapper);
         // 新的过滤条件组织机构
         LambdaQueryWrapper<TaBuilding> lambdaQueryWrapper = new LambdaQueryWrapper<>();
-        lambdaQueryWrapper.likeRight(TaBuilding::getInstitutionCode,taUser.getInstitutionCode());
+        lambdaQueryWrapper.in(TaBuilding::getInstitutionId,institutionList.stream().map(Institution::getInstitutionId).collect(Collectors.toList()));
         List<TaBuilding> list = taBuildingService.list(lambdaQueryWrapper);
         for (TaBuilding taBuilding: list) {
             TaPersonBuilding taPersonBuilding = new TaPersonBuilding();

src/main/java/com/yunzhi/marketing/center/taUser/controller/TaUserController.java

@@ -425,7 +425,7 @@ public class TaUserController extends BaseController {
             taUser.setPhone(phone);
             taUser.setStatus(status);
             taUser.setBuildingId(buildingId);
-            taUser.setInstitutionCode(currentUser.getInstitutionCode());
+            taUser.setInstitutionId(currentUser.getInstitutionId());
             if(null != isConsultant && isConsultant == 1){
                 taUser.setIsConsultant(true);
             }else if (null != isConsultant && isConsultant == 0){
@@ -520,7 +520,7 @@ public class TaUserController extends BaseController {
     public ResponseBean adminUserAdd(@RequestBody TaUser taUser,HttpServletRequest request){
         ResponseBean responseBean = new ResponseBean();
         try {
-            if (StringUtils.isEmpty(taUser.getInstitutionCode())){
+            if (StringUtils.isEmpty(taUser.getInstitutionId())){
                 return ResponseBean.error("组织机构必填", ResponseBean.ERROR_ILLEGAL_PARAMS);
             }
             taUser.setOrgId(getOrgId(request));

src/main/java/com/yunzhi/marketing/center/taUser/entity/TaUser.java

@@ -122,7 +122,7 @@ public class TaUser implements Serializable {
     /**
      * 组织机构编号
      */
-    private String institutionCode;
+    private String institutionId;
 
     /**
      * 权重

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

@@ -70,7 +70,7 @@ public class TaActivityDynamicEnlist implements Serializable {
     /**
      * 组织结构id
      */
-    private String institutionCode;
+    private String institutionId;
 
     /**
      * 分享人

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

@@ -356,7 +356,7 @@ public class TaBuilding implements Serializable {
     /**
      * 组织结构id
      */
-    private String institutionCode;
+    private String institutionId;
 
     /**
      * 项目亮点封面

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

@@ -125,7 +125,7 @@ public class TaBuildingDynamic implements Serializable {
     /**
      * 组织结构id
      */
-    private String institutionCode;
+    private String institutionId;
 
     /**
      * 活动的当前状态1:进行中，2:未开始,3:结束

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

@@ -72,7 +72,7 @@ public class TaBuildingIntention implements Serializable {
     /**
      * 组织结构id
      */
-    private String institutionCode;
+    private String institutionId;
 
 
 }

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

@@ -78,6 +78,6 @@ public class TaBuildingPanorama implements Serializable {
     /**
      * 组织结构id
      */
-    private String institutionCode;
+    private String institutionId;
 
 }

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

@@ -52,6 +52,6 @@ public class TaBuildingReport implements Serializable {
     /**
      * 组织结构id
      */
-    private String institutionCode;
+    private String institutionId;
 
 }

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

@@ -82,7 +82,7 @@ public class TaChannel implements Serializable {
     /**
      * 组织结构id
      */
-    private String institutionCode;
+    private String institutionId;
 
     /**
      * 公司id

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

@@ -87,7 +87,7 @@ public class TaChat implements Serializable {
     /**
      * 组织结构id
      */
-    private String institutionCode;
+    private String institutionId;
 
 
 }

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

@@ -72,6 +72,6 @@ public class TaCheckin implements Serializable {
     /**
      * 组织结构id
      */
-    private String institutionCode;
+    private String institutionId;
 
 }

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

@@ -73,6 +73,6 @@ public class TaCustomerMessage implements Serializable {
     /**
      * 组织结构id
      */
-    private String institutionCode;
+    private String institutionId;
 
 }

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

@@ -91,5 +91,5 @@ public class TaExtendContent implements Serializable {
     /**
      * 组织结构id
      */
-    private String institutionCode;
+    private String institutionId;
 }

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

@@ -134,7 +134,7 @@ public class TaLiveActivity implements Serializable {
     /**
      * 组织结构id
      */
-    private String institutionCode;
+    private String institutionId;
 
     /**
      * 权重

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

@@ -115,7 +115,7 @@ public class TaNews implements Serializable {
     /**
      * 组织结构id
      */
-    private String institutionCode;
+    private String institutionId;
 
     /**
      * 类型

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

@@ -63,7 +63,7 @@ public class TaNewsType implements Serializable {
     /**
      * 组织结构id
      */
-    private String institutionCode;
+    private String institutionId;
 
 
 }

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

@@ -197,7 +197,7 @@ public class TaPerson implements Serializable {
     /**
      * 组织结构id
      */
-    private String institutionCode;
+    private String institutionId;
 
     /**
      * 授权手机号时间

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

@@ -94,5 +94,5 @@ public class TaPersonFromRecord implements Serializable {
     /**
      * 组织结构id
      */
-    private String institutionCode;
+    private String institutionId;
 }

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

@@ -88,7 +88,7 @@ public class TaPersonIntentionRecord implements Serializable {
     /**
      * 组织结构id
      */
-    private String institutionCode;
+    private String institutionId;
 
     /**
      * 手机号

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

@@ -84,7 +84,7 @@ public class TaPersonVisitRecord implements Serializable {
     /**
      * 组织结构id
      */
-    private String institutionCode;
+    private String institutionId;
 
     /**
      * 场景值id

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

@@ -154,7 +154,7 @@ public class TaRecommendCustomer implements Serializable {
     /**
      * 组织结构id
      */
-    private String institutionCode;
+    private String institutionId;
 
     @DateTimeFormat("yyyy年MM月dd日")
     private LocalDateTime createDate;

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

@@ -75,6 +75,6 @@ public class TaSave implements Serializable {
     /**
      * 组织结构id
      */
-    private String institutionCode;
+    private String institutionId;
 
 }

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

@@ -74,7 +74,7 @@ public class TaSharePersonFrom implements Serializable {
     /**
      * 组织结构id
      */
-    private String institutionCode;
+    private String institutionId;
 
     /**
      * 楼盘id

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

@@ -57,6 +57,6 @@ public class TdBuildingType implements Serializable {
     /**
      * 组织结构id
      */
-    private String institutionCode;
+    private String institutionId;
 
 }

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

@@ -103,7 +103,7 @@ public class TsActivityDaily implements Serializable {
     /**
      * 组织结构id
      */
-    private String institutionCode;
+    private String institutionId;
 
     /**
      * 统计类型

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

@@ -112,7 +112,7 @@ public class TsConsultantKpi implements Serializable {
     /**
      * 组织结构id
      */
-    private String institutionCode;
+    private String institutionId;
 
     /**
      * 客户总计

src/main/java/com/yunzhi/marketing/excel/ActivityStatistics/TsChannelDaily.java

@@ -58,5 +58,5 @@ public class TsChannelDaily {
     /**
      * 组织结构id
      */
-    private String institutionCode;
+    private String institutionId;
 }

src/main/java/com/yunzhi/marketing/statistic/entity/TaCustomerFollowUpRecord.java

@@ -68,5 +68,5 @@ public class TaCustomerFollowUpRecord implements Serializable {
     /**
      * 组织结构id
      */
-    private String institutionCode;
+    private String institutionId;
 }

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

@@ -34,5 +34,5 @@ public class InstitutionDTO implements Serializable {
      * 组织代码
      */
     @NotBlank(message = "组织代码不能为空")
-    private String institutionCode;
+    private String institutionId;
 }