xx

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

@@ -414,6 +414,8 @@ public class TaUserController extends BaseController {
                                    HttpServletRequest request){
         ResponseBean responseBean = new ResponseBean();
         try {
+            Integer userId = getUserId(request);
+            TaUser currentUser = iTaUserService.getById(userId);
             //使用分页插件
             IPage pg = new Page<>(pageNum, pageSize);
             TaUser taUser = new TaUser();
@@ -422,6 +424,7 @@ public class TaUserController extends BaseController {
             taUser.setPhone(phone);
             taUser.setStatus(status);
             taUser.setBuildingId(buildingId);
+            taUser.setInstitutionCode(currentUser.getInstitutionCode());
             if(null != isConsultant && isConsultant == 1){
                 taUser.setIsConsultant(true);
             }else if (null != isConsultant && isConsultant == 0){

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

@@ -119,6 +119,11 @@ public class TaUser implements Serializable {
      */
     private String jobNumber;
 
+    /**
+     * 组织机构编号
+     */
+    private String institutionCode;
+
     /**
      * 权重
      */

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

@@ -67,6 +67,11 @@ public class TaActivityDynamicEnlist implements Serializable {
      */
     private Integer isCheckin;
 
+    /**
+     * 组织结构id
+     */
+    private String institutionCode;
+
     /**
      * 分享人
      */

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

@@ -353,6 +353,11 @@ public class TaBuilding implements Serializable {
      */
     private String highlightsType;
 
+    /**
+     * 组织结构id
+     */
+    private String institutionCode;
+
     /**
      * 项目亮点封面
      */

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

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

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

@@ -69,5 +69,10 @@ public class TaBuildingIntention implements Serializable {
      */
     private String buildingId;
 
+    /**
+     * 组织结构id
+     */
+    private String institutionCode;
+
 
 }

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

@@ -75,5 +75,9 @@ public class TaBuildingPanorama implements Serializable {
      */
     private Integer status;
 
+    /**
+     * 组织结构id
+     */
+    private String institutionCode;
 
 }

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

@@ -49,5 +49,9 @@ public class TaBuildingReport implements Serializable {
      */
     private String buildingId;
 
+    /**
+     * 组织结构id
+     */
+    private String institutionCode;
 
 }

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

@@ -79,6 +79,11 @@ public class TaChannel implements Serializable {
      */
     private LocalDateTime createDate;
 
+    /**
+     * 组织结构id
+     */
+    private String institutionCode;
+
     /**
      * 公司id
      */

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

@@ -84,5 +84,10 @@ public class TaChat implements Serializable {
      */
     private Integer orgId;
 
+    /**
+     * 组织结构id
+     */
+    private String institutionCode;
+
 
 }

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

@@ -69,4 +69,9 @@ public class TaCheckin implements Serializable {
      */
     private Integer orgId;
 
+    /**
+     * 组织结构id
+     */
+    private String institutionCode;
+
 }

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

@@ -70,5 +70,9 @@ public class TaCustomerMessage implements Serializable {
      */
     private Integer status;
 
+    /**
+     * 组织结构id
+     */
+    private String institutionCode;
 
 }

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

@@ -86,4 +86,10 @@ public class TaExtendContent implements Serializable {
     private String buildingId;
 
     private Integer cityId;
+
+
+    /**
+     * 组织结构id
+     */
+    private String institutionCode;
 }

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

@@ -131,6 +131,11 @@ public class TaLiveActivity implements Serializable {
      */
     private String updateUser;
 
+    /**
+     * 组织结构id
+     */
+    private String institutionCode;
+
     /**
      * 权重
      */

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

@@ -112,6 +112,11 @@ public class TaNews implements Serializable {
      */
     private Integer weight;
 
+    /**
+     * 组织结构id
+     */
+    private String institutionCode;
+
     /**
      * 类型
      */

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

@@ -60,5 +60,10 @@ public class TaNewsType implements Serializable {
      */
     private Integer status;
 
+    /**
+     * 组织结构id
+     */
+    private String institutionCode;
+
 
 }

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

@@ -193,6 +193,12 @@ public class TaPerson implements Serializable {
      * 项目id
      */
     private String buildingId;
+
+    /**
+     * 组织结构id
+     */
+    private String institutionCode;
+
     /**
      * 授权手机号时间
      */

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

@@ -90,4 +90,9 @@ public class TaPersonFromRecord implements Serializable {
      * 微信来源类型
      */
     private String sceneType;
+
+    /**
+     * 组织结构id
+     */
+    private String institutionCode;
 }

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

@@ -85,6 +85,11 @@ public class TaPersonIntentionRecord implements Serializable {
      */
     private Integer orgId;
 
+    /**
+     * 组织结构id
+     */
+    private String institutionCode;
+
     /**
      * 手机号
      */

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

@@ -81,6 +81,11 @@ public class TaPersonVisitRecord implements Serializable {
      */
     private String consultantId;
 
+    /**
+     * 组织结构id
+     */
+    private String institutionCode;
+
     /**
      * 场景值id
      */

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

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

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

@@ -72,5 +72,9 @@ public class TaSave implements Serializable {
      */
     private String buildingId;
 
+    /**
+     * 组织结构id
+     */
+    private String institutionCode;
 
 }

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

@@ -71,6 +71,11 @@ public class TaSharePersonFrom implements Serializable {
      */
     private Integer orgId;
 
+    /**
+     * 组织结构id
+     */
+    private String institutionCode;
+
     /**
      * 楼盘id
      */

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

@@ -54,5 +54,9 @@ public class TdBuildingType implements Serializable {
      */
     private String buildingId;
 
+    /**
+     * 组织结构id
+     */
+    private String institutionCode;
 
 }

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

@@ -100,6 +100,11 @@ public class TsActivityDaily implements Serializable {
      */
     private Integer channelId;
 
+    /**
+     * 组织结构id
+     */
+    private String institutionCode;
+
     /**
      * 统计类型
      */

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

@@ -109,6 +109,11 @@ public class TsConsultantKpi implements Serializable {
      */
     private Integer favorNum;
 
+    /**
+     * 组织结构id
+     */
+    private String institutionCode;
+
     /**
      * 客户总计
      */

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

@@ -55,4 +55,8 @@ public class TsChannelDaily {
     @ExcelIgnore
     private String targetId;
 
+    /**
+     * 组织结构id
+     */
+    private String institutionCode;
 }

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

@@ -64,4 +64,9 @@ public class TaCustomerFollowUpRecord implements Serializable {
      * 客户性别
      */
     private Integer customerSex;
+
+    /**
+     * 组织结构id
+     */
+    private String institutionCode;
 }

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

@@ -50,21 +50,21 @@ public class InstitutionController extends BaseController {
 
     /**
      * 分页查询列表
-     * @param institutionId
+     * @param institutionCode
      * @return
      */
     @ApiOperation(value = "admin-组织机构列表查询", notes = "admin-组织机构列表查询")
     @RequestMapping(value="/admin/institution/list",method= RequestMethod.GET)
-    public ResponseBean institutionList(@RequestParam(value ="institutionId",required = false) String institutionId,
+    public ResponseBean institutionList(@RequestParam(value ="institutionCode",required = false) String institutionCode,
                                         @RequestHeader("authorization") String token, HttpServletRequest request){
         ResponseBean responseBean = new ResponseBean();
         try {
             LambdaQueryWrapper<Institution> queryWrapper = new LambdaQueryWrapper<>();
             queryWrapper.eq(Institution::getOrgId,getOrgId(request));
-            if (StringUtils.isEmpty(institutionId)){
+            if (StringUtils.isEmpty(institutionCode)){
                 queryWrapper.eq(Institution::getType,1);
             }else {
-                Institution institution = iInstitutionService.getById(institutionId);
+                Institution institution = iInstitutionService.getById(institutionCode);
                 queryWrapper.eq(Institution::getType,institution.getType() + 1);
                 queryWrapper.likeLeft(Institution::getInstitutionCode,institution.getInstitutionCode());
             }
@@ -114,7 +114,7 @@ public class InstitutionController extends BaseController {
     public ResponseBean institutionDelete(@PathVariable String id, @RequestHeader("authorization") String token, HttpServletRequest request){
         ResponseBean responseBean = new ResponseBean();
         try {
-            responseBean = iInstitutionService.deleteByInstitutionId(id);
+            responseBean = iInstitutionService.deleteByinstitutionCode(id);
         }catch (Exception e){
             e.printStackTrace();
             logger.error("institutionDelete -=- {}",e.toString());
@@ -139,7 +139,7 @@ public class InstitutionController extends BaseController {
             Institution institution = new Institution();
             BeanUtils.copyProperties(institutionDTO,institution);
             institution.setOrgId(orgId);
-            institution.setInstitutionId(id);
+            institution.setinstitutionCode(id);
              responseBean = iInstitutionService.updateInstitution(institution);
         }catch (Exception e){
             e.printStackTrace();

src/main/java/com/yunzhi/marketing/xlk/service/IInstitutionService.java

@@ -26,7 +26,7 @@ public interface IInstitutionService extends IService<Institution> {
      * @param id
      * @return
      */
-    ResponseBean deleteByInstitutionId(String id);
+    ResponseBean deleteByinstitutionCode(String id);
 
     /**
      * 修改组织机构

src/main/java/com/yunzhi/marketing/xlk/service/impl/InstitutionServiceImpl.java

@@ -86,7 +86,7 @@ public class InstitutionServiceImpl extends ServiceImpl<InstitutionMapper, Insti
      * @return
      */
     @Override
-    public ResponseBean deleteByInstitutionId(String id) {
+    public ResponseBean deleteByinstitutionCode(String id) {
         Institution institution = institutionMapper.selectById(id);
         LambdaQueryWrapper<Institution> queryWrapper = new LambdaQueryWrapper<>();
         queryWrapper.likeLeft(Institution::getInstitutionCode,institution.getInstitutionCode());
@@ -114,7 +114,7 @@ public class InstitutionServiceImpl extends ServiceImpl<InstitutionMapper, Insti
         // 根据code获取机构
         LambdaQueryWrapper<Institution> queryWrapper = new LambdaQueryWrapper<>();
         queryWrapper.eq(Institution::getInstitutionCode,institution.getInstitutionCode());
-        queryWrapper.ne(Institution::getInstitutionId,institution.getInstitutionId());
+        queryWrapper.ne(Institution::getinstitutionCode,institution.getinstitutionCode());
         Institution childInstitution = institutionMapper.selectOne(queryWrapper);
         if (null != childInstitution){
             return ResponseBean.error("此组织机构code已存在", ResponseBean.ERROR_UNAVAILABLE);

src/main/resources/mapper/TaUserMapper.xml

@@ -83,6 +83,9 @@
             <if test="taUser.isConsultant != null">
                 and t.is_consultant = #{taUser.isConsultant}
             </if>
+            <if test="taUser.institutionCode != null and taUser.institutionCode != ''">
+                and t.institution_code like CONCAT('%', #{taUser.institutionCode})
+            </if>
             <if test="taUser.miniStatus == 0">
                 and d.person_id is null
             </if>