组织架构

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

@@ -1,6 +1,7 @@
 package com.yunzhi.marketing.center.taUser.controller;
 
 import com.alibaba.fastjson.JSONObject;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
@@ -21,7 +22,9 @@ import com.yunzhi.marketing.mapper.TaRoleMapper;
 import com.yunzhi.marketing.entity.*;
 import com.yunzhi.marketing.service.*;
 import com.yunzhi.marketing.xlk.entity.Institution;
+import com.yunzhi.marketing.xlk.entity.UserInstitution;
 import com.yunzhi.marketing.xlk.service.IInstitutionService;
+import com.yunzhi.marketing.xlk.service.IUserInstitutionService;
 import io.jsonwebtoken.lang.Collections;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
@@ -37,6 +40,7 @@ import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
+import java.util.stream.Collectors;
 
 /**
  * <p>
@@ -92,6 +96,9 @@ public class TaUserController extends BaseController {
     @Autowired
     private IInstitutionService iInstitutionService;
 
+    @Autowired
+    private IUserInstitutionService userInstitutionService;
+
     /**
      * 分页查询列表
      * @param pageNum
@@ -442,7 +449,7 @@ public class TaUserController extends BaseController {
             taUser.setMiniStatus(miniStatus);
             taUser.setJobNumber(jobNumber);
 
-            IPage<TaUser> result = iTaUserService.seleUserList(pg,taUser,getTaPersonBuildingListByUserId(request));
+            IPage<TaUser> result = iTaUserService.seleUserList(pg,taUser,getTaPersonBuildingListByUserId(request),getInstitutionIds(request));
             List<TaUser> taUserList = result.getRecords();
             taUserList.forEach(e -> {
                 List<TaTags> taTagsList = iTaUserService.getTagsList(e);
@@ -510,6 +517,11 @@ public class TaUserController extends BaseController {
                     taUser.setBuildingIds(buildings);
                 }
             }
+            // 绑定的组织机构返回
+            LambdaQueryWrapper<UserInstitution> institutionLambdaQueryWrapper = new LambdaQueryWrapper<>();
+            institutionLambdaQueryWrapper.eq(UserInstitution::getUserId,id);
+            List<UserInstitution> list = userInstitutionService.list(institutionLambdaQueryWrapper);
+            taUser.setInstitutionIdLis(list.stream().map(UserInstitution::getInstitutionId).collect(Collectors.toList()));
             responseBean.addSuccess(taUser);
         }catch (Exception e){
             e.printStackTrace();

src/main/java/com/yunzhi/marketing/center/taUser/mapper/TaUserMapper.java

@@ -29,7 +29,7 @@ public interface TaUserMapper extends BaseMapper<TaUser> {
 	
 	List<TaUser> getUserList(@Param("phone") String phone,@Param("orgId") Integer orgId);
 
-    IPage<TaUser> seleUserList(IPage pg,@Param("taUser") TaUser taUser,@Param("personBuildingList") List<TaPersonBuilding> personBuildingList);
+    IPage<TaUser> seleUserList(IPage pg,@Param("taUser") TaUser taUser,@Param("personBuildingList") List<TaPersonBuilding> personBuildingList,@Param("institutionIds") List<String> institutionIds);
 
     Integer validateWeight(@Param("buildingIds") List<String> buildingIds, @Param("buildingId") String buildingId, @Param("weight") String weight, @Param("userId")Integer userId);
 

src/main/java/com/yunzhi/marketing/center/taUser/service/ITaUserService.java

@@ -65,7 +65,7 @@ public interface ITaUserService extends IService<TaUser> {
      * @param taPersonBuildingListByUserId
      * @return
      */
-    IPage<TaUser> seleUserList(IPage pg, TaUser taUser, List<TaPersonBuilding> taPersonBuildingListByUserId);
+    IPage<TaUser> seleUserList(IPage pg, TaUser taUser, List<TaPersonBuilding> taPersonBuildingListByUserId,List<String> institutionIds);
 
     /**
      * 获取用户信息

src/main/java/com/yunzhi/marketing/center/taUser/service/impl/TaUserServiceImpl.java

@@ -1,6 +1,7 @@
 package com.yunzhi.marketing.center.taUser.service.impl;
 
 import cn.binarywang.wx.miniapp.api.WxMaService;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
@@ -25,6 +26,7 @@ import com.yunzhi.marketing.mapper.*;
 import com.yunzhi.marketing.service.*;
 import com.yunzhi.marketing.xlk.entity.UserInstitution;
 import com.yunzhi.marketing.xlk.mapper.UserInstitutionMapper;
+import me.chanjar.weixin.cp.bean.WxCpAgent;
 import org.apache.commons.collections.CollectionUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
@@ -499,20 +501,18 @@ public class TaUserServiceImpl extends ServiceImpl<TaUserMapper, TaUser> impleme
             taPersonBuilding.setUserId(taUser.getUserId());
             taPersonBuilding.setCreateDate(LocalDateTime.now());
             taPersonBuildingMapper.insert(taPersonBuilding);
+        } else {
+            //非置业顾问可授权多个项目
+            List<String> buildingIdList = taUser.getBuildingIds();
+            LocalDateTime nowTime = LocalDateTime.now();
+            buildingIdList.forEach(e -> {
+                TaPersonBuilding taPersonBuilding = new TaPersonBuilding();
+                taPersonBuilding.setBuildingId(e);
+                taPersonBuilding.setUserId(taUser.getUserId());
+                taPersonBuilding.setCreateDate(nowTime);
+                taPersonBuildingMapper.insert(taPersonBuilding);
+            });
         }
-//        // 这个版本取消非置业顾问授权
-//        else {
-//            //非置业顾问可授权多个项目
-//            List<String> buildingIdList = taUser.getBuildingIds();
-//            LocalDateTime nowTime = LocalDateTime.now();
-//            buildingIdList.forEach(e -> {
-//                TaPersonBuilding taPersonBuilding = new TaPersonBuilding();
-//                taPersonBuilding.setBuildingId(e);
-//                taPersonBuilding.setUserId(taUser.getUserId());
-//                taPersonBuilding.setCreateDate(nowTime);
-//                taPersonBuildingMapper.insert(taPersonBuilding);
-//            });
-//        }
 
         return taUser;
     }
@@ -607,6 +607,26 @@ public class TaUserServiceImpl extends ServiceImpl<TaUserMapper, TaUser> impleme
             });
         }
 
+        // 更新这个用户的组织机构
+        List<String> institutionIdLis = taUser.getInstitutionIdLis();
+        if (institutionIdLis.size() > 0) {
+            // 先删除后新增
+            LambdaQueryWrapper<UserInstitution> userInstitutionLambdaQueryWrapper = new LambdaQueryWrapper<>();
+            userInstitutionLambdaQueryWrapper.eq(UserInstitution::getUserId,taUser.getUserId());
+            userInstitutionMapper.delete(userInstitutionLambdaQueryWrapper);
+            // 新增
+            institutionIdLis.forEach(e -> {
+                UserInstitution userInstitution = new UserInstitution();
+                userInstitution.setInstitutionId(e);
+                userInstitution.setOrgId(taUser.getOrgId());
+                userInstitution.setUserId(taUser.getUserId());
+                userInstitution.setCreateDate(LocalDateTime.now());
+                userInstitutionMapper.insert(userInstitution);
+
+            });
+        }
+
+
         //更新person
         TaPerson taPerson = new TaPerson();
         taPerson.setAvatarurl(taUser.getAvatar());
@@ -703,8 +723,8 @@ public class TaUserServiceImpl extends ServiceImpl<TaUserMapper, TaUser> impleme
      * @return
      */
     @Override
-    public IPage<TaUser> seleUserList(IPage pg, TaUser taUser, List<TaPersonBuilding> personBuildingList) {
-        return taUserMapper.seleUserList(pg, taUser, personBuildingList);
+    public IPage<TaUser> seleUserList(IPage pg, TaUser taUser, List<TaPersonBuilding> personBuildingList,List<String> institutionIds) {
+        return taUserMapper.seleUserList(pg, taUser, personBuildingList,institutionIds);
     }
 
     @Override

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

@@ -97,6 +97,7 @@ public class ExtendContentController extends BaseController {
             queryWrapper.ne("status",9);
             queryWrapper.eq(status != null, "status", status);
             queryWrapper.eq( "org_id", getOrgId(request));
+            queryWrapper.in("institution_id",getInstitutionIds(request));
             queryWrapper.and(taPersonBuildingList.size() > 0, wapper -> wapper.in("building_id",taPersonBuildingList.stream().map(TaPersonBuilding::getBuildingId).collect(Collectors.toList())).or().eq("create_user",getUserId(request)));
             queryWrapper.orderByDesc("order_no");
             queryWrapper.orderByDesc("create_date");
@@ -186,7 +187,10 @@ public class ExtendContentController extends BaseController {
             extendContent.setContentType("nothing");
         }
         extendContent.setCreateUser(getUserId(request));
-        extendContent.setInstitutionId(getInstitutionId(extendContent.getBuildingId()));
+        if (StringUtils.isNotEmpty(extendContent.getBuildingId())) {
+            extendContent.setInstitutionId(getInstitutionId(extendContent.getBuildingId()));
+        }
+
         responseBean = iExtendContentService.extendContentAdd(extendContent);
         responseBean.addSuccess(extendContent);
         return responseBean;

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

@@ -140,7 +140,6 @@ public class TaChannelController extends BaseController {
             int channelCode= taChannelMapper.channelCode();
             channel.setChannelCode(String.valueOf(channelCode));
             channel.setOrgId(orgId);
-            channel.setInstitutionId(getInstitutionId(channel.getBuildingId()));
             if (taChannelService.save(channel)){
                 responseBean.addSuccess(channel);
             }else {

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

@@ -81,7 +81,7 @@ public class TaNewsController extends BaseController {
                                    @RequestParam(value = "newsStatus", required = false) Integer newsStatus,
                                    @RequestParam(value = "title", required = false) String title,
                                    @RequestParam(value = "cityId", required = false) Integer cityId){
-        ResponseBean responseBean = iTaNewsService.getList(pageNum, pageSize, buildingId, getOrgId(request), newsTypeId, newsStatus, title, cityId,getTaPersonBuildingListByUserId(request));
+        ResponseBean responseBean = iTaNewsService.getList(pageNum, pageSize, buildingId, getOrgId(request), newsTypeId, newsStatus, title, cityId,getTaPersonBuildingListByUserId(request),getInstitutionIds(request));
         return responseBean;
     }
 
@@ -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(taNews.getBuildingId()));
         ResponseBean responseBean = iTaNewsService.addTaNews(taNews);
         return responseBean;
     }

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

@@ -57,7 +57,7 @@ public class TaNewsTypeController extends BaseController {
                                        @RequestParam(value ="pageSize",defaultValue = "10") Integer pageSize,
                                        @RequestParam(value = "buildingId", required = false) String buildingId,
                                        HttpServletRequest request){
-        ResponseBean responseBean = iTaNewsTypeService.getList(pageNum, pageSize, buildingId, getOrgId(request),getTaPersonBuildingListByUserId(request));
+        ResponseBean responseBean = iTaNewsTypeService.getList(pageNum, pageSize, buildingId, getOrgId(request),getTaPersonBuildingListByUserId(request),getInstitutionIds(request));
         return responseBean;
     }
 

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

@@ -113,7 +113,7 @@ public class TdBuildingTypeController extends BaseController {
 
     /**
      * 分页查询列表
-     * @param pageNum
+     * @param
      * @param pageSize
      * @return
      */

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

@@ -59,4 +59,9 @@ public class TaNewsType implements Serializable {
      * 状态
      */
     private Integer status;
+
+    /**
+     * 组织机构id
+     */
+    private String institutionId;
 }

src/main/java/com/yunzhi/marketing/service/ITaNewsService.java

@@ -27,7 +27,7 @@ public interface ITaNewsService extends IService<TaNews> {
      * @param newsTypeId
      * @return
      */
-    ResponseBean getList(Integer pageNum, Integer pageSize, String buildingId, Integer orgId, Integer newsTypeId, Integer newsStatus, String title, Integer cityId, List<TaPersonBuilding> personBuildingList);
+    ResponseBean getList(Integer pageNum, Integer pageSize, String buildingId, Integer orgId, Integer newsTypeId, Integer newsStatus, String title, Integer cityId, List<TaPersonBuilding> personBuildingList,List<String> institutionIds);
 
     /**
      * 根据Id查询资讯数据

src/main/java/com/yunzhi/marketing/service/ITaNewsTypeService.java

@@ -25,7 +25,7 @@ public interface ITaNewsTypeService extends IService<TaNewsType> {
      * @param orgId
      * @return
      */
-    ResponseBean getList(Integer pageNum, Integer pageSize, String buildingId, Integer orgId, List<TaPersonBuilding> personBuildingList);
+    ResponseBean getList(Integer pageNum, Integer pageSize, String buildingId, Integer orgId, List<TaPersonBuilding> personBuildingList,List<String> institutionIds);
 
     /**
      * 根据Id查询资讯类型数据

src/main/java/com/yunzhi/marketing/service/impl/TaNewsServiceImpl.java

@@ -55,7 +55,7 @@ public class TaNewsServiceImpl extends ServiceImpl<TaNewsMapper, TaNews> impleme
 
 
     @Override
-    public ResponseBean getList(Integer pageNum, Integer pageSize, String buildingId, Integer orgId, Integer newsTypeId, Integer newsStatus, String title, Integer cityId, List<TaPersonBuilding> personBuildingList) {
+    public ResponseBean getList(Integer pageNum, Integer pageSize, String buildingId, Integer orgId, Integer newsTypeId, Integer newsStatus, String title, Integer cityId, List<TaPersonBuilding> personBuildingList,List<String> institutionIds) {
         ResponseBean responseBean = new ResponseBean();
 
         IPage<TaNews> page = new Page<>();
@@ -70,6 +70,7 @@ public class TaNewsServiceImpl extends ServiceImpl<TaNewsMapper, TaNews> impleme
         taNewsQueryWrapper.eq("status", 1);
         taNewsQueryWrapper.eq(cityId != null, "city_id", cityId);
         taNewsQueryWrapper.like(title!=null,"news_name", title);
+        taNewsQueryWrapper.in("institution_id",institutionIds);
         taNewsQueryWrapper.in(personBuildingList.size() > 0,"building_id",personBuildingList.stream().map(TaPersonBuilding::getBuildingId).collect(Collectors.toList()));
         taNewsQueryWrapper.orderByAsc("news_status");
         taNewsQueryWrapper.orderByDesc("weight","create_date");

src/main/java/com/yunzhi/marketing/service/impl/TaNewsTypeServiceImpl.java

@@ -42,7 +42,7 @@ public class TaNewsTypeServiceImpl extends ServiceImpl<TaNewsTypeMapper, TaNewsT
 
 
     @Override
-    public ResponseBean getList(Integer pageNum, Integer pageSize, String buildingId, Integer orgId, List<TaPersonBuilding> personBuildingList) {
+    public ResponseBean getList(Integer pageNum, Integer pageSize, String buildingId, Integer orgId, List<TaPersonBuilding> personBuildingList,List<String> institutionIds) {
         ResponseBean responseBean = new ResponseBean();
         IPage<TaNewsType> page = new Page<>();
         page.setCurrent(pageNum);
@@ -52,6 +52,7 @@ public class TaNewsTypeServiceImpl extends ServiceImpl<TaNewsTypeMapper, TaNewsT
         taNewsQueryWrapper.eq(StringUtils.isNotBlank(buildingId),"building_id", buildingId);
         taNewsQueryWrapper.eq(orgId != null,"org_id", orgId);
         taNewsQueryWrapper.eq("status", 1);
+        taNewsQueryWrapper.in("institution_id",institutionIds);
         taNewsQueryWrapper.in(personBuildingList.size() > 0,"building_id", personBuildingList.stream().map(TaPersonBuilding::getBuildingId).collect(Collectors.toList()));
         taNewsQueryWrapper.orderByDesc("create_date");
         IPage<TaNewsType> typeIPage = this.page(page, taNewsQueryWrapper);
@@ -99,6 +100,9 @@ public class TaNewsTypeServiceImpl extends ServiceImpl<TaNewsTypeMapper, TaNewsT
         taNewsType.setCreateDate(LocalDateTime.now());
         taNewsType.setStatus(1);
         taNewsType.setOrgId(orgId);
+        String buildingId = taNewsType.getBuildingId();
+        TaBuilding building = iTaBuildingService.getById(buildingId);
+        taNewsType.setInstitutionId(building.getInstitutionId());
         this.save(taNewsType);
         responseBean.addSuccess(taNewsType);
         return responseBean;

src/main/resources/mapper/TaUserMapper.xml

@@ -66,7 +66,21 @@
             d.person_id as consultant_person_id,
             if(d.person_id is not null,1,0) as mini_status
         FROM
-            ta_user t
+            (SELECT
+                u.*
+                FROM
+                ta_user u
+                LEFT JOIN xlk_user_institution i ON u.user_id = i.user_id
+                WHERE
+                u.org_id = #{taUser.orgId}
+                <if test="institutionIds != null and institutionIds.size > 0">
+                    AND i.institution_id in
+                    <foreach collection="institutionIds" item="item" open="(" close=")" separator=",">
+                        #{item}
+                    </foreach>
+                </if>
+                GROUP BY
+                u.user_id) t
             LEFT JOIN ta_person_building b ON t.user_id = b.user_id
             LEFT JOIN ta_person d on t.user_id = d.user_id
         WHERE