fuxingfan 3 年前
父节点
当前提交
2e184da6a6
共有 30 个文件被更改,包括 42 次插入31 次删除
  1. 12
    1
      src/main/java/com/yunzhi/marketing/base/BaseController.java
  2. 2
    2
      src/main/java/com/yunzhi/marketing/center/taUser/controller/TaUserController.java
  3. 1
    1
      src/main/java/com/yunzhi/marketing/center/taUser/entity/TaUser.java
  4. 1
    1
      src/main/java/com/yunzhi/marketing/entity/TaActivityDynamicEnlist.java
  5. 1
    1
      src/main/java/com/yunzhi/marketing/entity/TaBuilding.java
  6. 1
    1
      src/main/java/com/yunzhi/marketing/entity/TaBuildingDynamic.java
  7. 1
    1
      src/main/java/com/yunzhi/marketing/entity/TaBuildingIntention.java
  8. 1
    1
      src/main/java/com/yunzhi/marketing/entity/TaBuildingPanorama.java
  9. 1
    1
      src/main/java/com/yunzhi/marketing/entity/TaBuildingReport.java
  10. 1
    1
      src/main/java/com/yunzhi/marketing/entity/TaChannel.java
  11. 1
    1
      src/main/java/com/yunzhi/marketing/entity/TaChat.java
  12. 1
    1
      src/main/java/com/yunzhi/marketing/entity/TaCheckin.java
  13. 1
    1
      src/main/java/com/yunzhi/marketing/entity/TaCustomerMessage.java
  14. 1
    1
      src/main/java/com/yunzhi/marketing/entity/TaExtendContent.java
  15. 1
    1
      src/main/java/com/yunzhi/marketing/entity/TaLiveActivity.java
  16. 1
    1
      src/main/java/com/yunzhi/marketing/entity/TaNews.java
  17. 1
    1
      src/main/java/com/yunzhi/marketing/entity/TaNewsType.java
  18. 1
    1
      src/main/java/com/yunzhi/marketing/entity/TaPerson.java
  19. 1
    1
      src/main/java/com/yunzhi/marketing/entity/TaPersonFromRecord.java
  20. 1
    1
      src/main/java/com/yunzhi/marketing/entity/TaPersonIntentionRecord.java
  21. 1
    1
      src/main/java/com/yunzhi/marketing/entity/TaPersonVisitRecord.java
  22. 1
    1
      src/main/java/com/yunzhi/marketing/entity/TaRecommendCustomer.java
  23. 1
    1
      src/main/java/com/yunzhi/marketing/entity/TaSave.java
  24. 1
    1
      src/main/java/com/yunzhi/marketing/entity/TaSharePersonFrom.java
  25. 1
    1
      src/main/java/com/yunzhi/marketing/entity/TdBuildingType.java
  26. 1
    1
      src/main/java/com/yunzhi/marketing/entity/TsActivityDaily.java
  27. 1
    1
      src/main/java/com/yunzhi/marketing/entity/TsConsultantKpi.java
  28. 1
    1
      src/main/java/com/yunzhi/marketing/excel/ActivityStatistics/TsChannelDaily.java
  29. 1
    1
      src/main/java/com/yunzhi/marketing/statistic/entity/TaCustomerFollowUpRecord.java
  30. 1
    1
      src/main/java/com/yunzhi/marketing/xlk/dto/InstitutionDTO.java

+ 12
- 1
src/main/java/com/yunzhi/marketing/base/BaseController.java 查看文件

@@ -9,12 +9,15 @@ import com.yunzhi.marketing.entity.TaBuilding;
9 9
 import com.yunzhi.marketing.entity.TaPersonBuilding;
10 10
 import com.yunzhi.marketing.service.ITaBuildingService;
11 11
 import com.yunzhi.marketing.service.ITaPersonBuildingService;
12
+import com.yunzhi.marketing.xlk.entity.Institution;
13
+import com.yunzhi.marketing.xlk.service.IInstitutionService;
12 14
 import org.springframework.beans.factory.annotation.Autowired;
13 15
 
14 16
 import javax.servlet.http.HttpServletRequest;
15 17
 import java.util.ArrayList;
16 18
 import java.util.List;
17 19
 import java.util.Map;
20
+import java.util.stream.Collectors;
18 21
 
19 22
 /**
20 23
  * @author FXF
@@ -30,6 +33,9 @@ public class BaseController {
30 33
     @Autowired
31 34
     private ITaBuildingService taBuildingService;
32 35
 
36
+    @Autowired
37
+    public IInstitutionService iInstitutionService;
38
+
33 39
     /**
34 40
      * 获取orgId
35 41
      *
@@ -142,9 +148,14 @@ public class BaseController {
142 148
 //        taPersonBuildingQueryWrapper.eq("user_id", taUser.getUserId());
143 149
 //        List<TaPersonBuilding> taPersonBuildingList = taPersonBuildingService.list(taPersonBuildingQueryWrapper);
144 150
         List<TaPersonBuilding> taPersonBuildingList = new ArrayList<>();
151
+        // 获取当前人员的所有有权访问的组织机构
152
+        Institution institution = iInstitutionService.getById(taUser.getInstitutionId());
153
+        LambdaQueryWrapper<Institution> institutionLambdaQueryWrapper = new LambdaQueryWrapper<>();
154
+        institutionLambdaQueryWrapper.likeRight(Institution::getInstitutionCode,institution.getInstitutionCode());
155
+        List<Institution> institutionList = iInstitutionService.list(institutionLambdaQueryWrapper);
145 156
         // 新的过滤条件组织机构
146 157
         LambdaQueryWrapper<TaBuilding> lambdaQueryWrapper = new LambdaQueryWrapper<>();
147
-        lambdaQueryWrapper.likeRight(TaBuilding::getInstitutionCode,taUser.getInstitutionCode());
158
+        lambdaQueryWrapper.in(TaBuilding::getInstitutionId,institutionList.stream().map(Institution::getInstitutionId).collect(Collectors.toList()));
148 159
         List<TaBuilding> list = taBuildingService.list(lambdaQueryWrapper);
149 160
         for (TaBuilding taBuilding: list) {
150 161
             TaPersonBuilding taPersonBuilding = new TaPersonBuilding();

+ 2
- 2
src/main/java/com/yunzhi/marketing/center/taUser/controller/TaUserController.java 查看文件

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

+ 1
- 1
src/main/java/com/yunzhi/marketing/center/taUser/entity/TaUser.java 查看文件

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

+ 1
- 1
src/main/java/com/yunzhi/marketing/entity/TaActivityDynamicEnlist.java 查看文件

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

+ 1
- 1
src/main/java/com/yunzhi/marketing/entity/TaBuilding.java 查看文件

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

+ 1
- 1
src/main/java/com/yunzhi/marketing/entity/TaBuildingDynamic.java 查看文件

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

+ 1
- 1
src/main/java/com/yunzhi/marketing/entity/TaBuildingIntention.java 查看文件

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

+ 1
- 1
src/main/java/com/yunzhi/marketing/entity/TaBuildingPanorama.java 查看文件

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

+ 1
- 1
src/main/java/com/yunzhi/marketing/entity/TaBuildingReport.java 查看文件

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

+ 1
- 1
src/main/java/com/yunzhi/marketing/entity/TaChannel.java 查看文件

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

+ 1
- 1
src/main/java/com/yunzhi/marketing/entity/TaChat.java 查看文件

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

+ 1
- 1
src/main/java/com/yunzhi/marketing/entity/TaCheckin.java 查看文件

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

+ 1
- 1
src/main/java/com/yunzhi/marketing/entity/TaCustomerMessage.java 查看文件

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

+ 1
- 1
src/main/java/com/yunzhi/marketing/entity/TaExtendContent.java 查看文件

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

+ 1
- 1
src/main/java/com/yunzhi/marketing/entity/TaLiveActivity.java 查看文件

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

+ 1
- 1
src/main/java/com/yunzhi/marketing/entity/TaNews.java 查看文件

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

+ 1
- 1
src/main/java/com/yunzhi/marketing/entity/TaNewsType.java 查看文件

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

+ 1
- 1
src/main/java/com/yunzhi/marketing/entity/TaPerson.java 查看文件

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

+ 1
- 1
src/main/java/com/yunzhi/marketing/entity/TaPersonFromRecord.java 查看文件

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

+ 1
- 1
src/main/java/com/yunzhi/marketing/entity/TaPersonIntentionRecord.java 查看文件

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

+ 1
- 1
src/main/java/com/yunzhi/marketing/entity/TaPersonVisitRecord.java 查看文件

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

+ 1
- 1
src/main/java/com/yunzhi/marketing/entity/TaRecommendCustomer.java 查看文件

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

+ 1
- 1
src/main/java/com/yunzhi/marketing/entity/TaSave.java 查看文件

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

+ 1
- 1
src/main/java/com/yunzhi/marketing/entity/TaSharePersonFrom.java 查看文件

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

+ 1
- 1
src/main/java/com/yunzhi/marketing/entity/TdBuildingType.java 查看文件

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

+ 1
- 1
src/main/java/com/yunzhi/marketing/entity/TsActivityDaily.java 查看文件

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

+ 1
- 1
src/main/java/com/yunzhi/marketing/entity/TsConsultantKpi.java 查看文件

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

+ 1
- 1
src/main/java/com/yunzhi/marketing/excel/ActivityStatistics/TsChannelDaily.java 查看文件

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

+ 1
- 1
src/main/java/com/yunzhi/marketing/statistic/entity/TaCustomerFollowUpRecord.java 查看文件

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

+ 1
- 1
src/main/java/com/yunzhi/marketing/xlk/dto/InstitutionDTO.java 查看文件

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