组织机构

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

@@ -143,20 +143,11 @@ 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);
+
         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.in(TaBuilding::getInstitutionId,institutionList.stream().map(Institution::getInstitutionId).collect(Collectors.toList()));
-        List<TaBuilding> list = taBuildingService.list(lambdaQueryWrapper);
+        List<TaBuilding> list = taBuildingService.selectByUserId(taUser.getUserId());
         for (TaBuilding taBuilding: list) {
             TaPersonBuilding taPersonBuilding = new TaPersonBuilding();
             taPersonBuilding.setBuildingId(taBuilding.getBuildingId());

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

@@ -20,6 +20,7 @@ import com.yunzhi.marketing.common.StringUtils;
 import com.yunzhi.marketing.mapper.TaRoleMapper;
 import com.yunzhi.marketing.entity.*;
 import com.yunzhi.marketing.service.*;
+import io.jsonwebtoken.lang.Collections;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.slf4j.Logger;
@@ -426,7 +427,6 @@ public class TaUserController extends BaseController {
             taUser.setPhone(phone);
             taUser.setStatus(status);
             taUser.setBuildingId(buildingId);
-            taUser.setInstitutionId(currentUser.getInstitutionId());
             if(null != isConsultant && isConsultant == 1){
                 taUser.setIsConsultant(true);
             }else if (null != isConsultant && isConsultant == 0){
@@ -522,7 +522,7 @@ public class TaUserController extends BaseController {
     public ResponseBean adminUserAdd(@RequestBody TaUser taUser,HttpServletRequest request){
         ResponseBean responseBean = new ResponseBean();
         try {
-            if (StringUtils.isEmpty(taUser.getInstitutionId())){
+            if (Collections.isEmpty(taUser.getInstitutionIdLis())){
                 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 institutionId;
+    private List<String> institutionIdLis;
 
     /**
      * 权重

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

@@ -23,6 +23,8 @@ import com.yunzhi.marketing.common.WxUtils;
 import com.yunzhi.marketing.entity.*;
 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 org.apache.commons.collections.CollectionUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
@@ -98,6 +100,9 @@ public class TaUserServiceImpl extends ServiceImpl<TaUserMapper, TaUser> impleme
     @Autowired
     private TaChannelProxyMapper taChannelProxyMapper;
 
+    @Autowired
+    private UserInstitutionMapper userInstitutionMapper;
+
     @Autowired
     private WxUtils wxUtils;
 
@@ -456,6 +461,18 @@ public class TaUserServiceImpl extends ServiceImpl<TaUserMapper, TaUser> impleme
         if (taUserMapper.insert(taUser) < 1) {
             throw new Exception("生成用户信息失败");
         }
+        // 保存组织机构关系
+        List<String> institutionIdLis = taUser.getInstitutionIdLis();
+        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);
+
+        });
+
 
         //保存标签
         List<Integer> tags = taUser.getTaTags();

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

@@ -5,11 +5,15 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.yunzhi.marketing.base.ResponseBean;
 import com.yunzhi.marketing.common.CommConstant;
+import com.yunzhi.marketing.entity.TaBuilding;
 import com.yunzhi.marketing.entity.TaPolicy;
 import com.yunzhi.marketing.entity.TdCity;
 import com.yunzhi.marketing.service.ITdCityService;
 import com.yunzhi.marketing.service.ITaPolicyService;
 import com.yunzhi.marketing.base.BaseController;
+import com.yunzhi.marketing.xlk.entity.TaPolicyType;
+import com.yunzhi.marketing.xlk.entity.Video;
+import com.yunzhi.marketing.xlk.service.ITaPolicyTypeService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiImplicitParam;
 import io.swagger.annotations.ApiImplicitParams;
@@ -27,6 +31,7 @@ import org.springframework.web.bind.annotation.RestController;
 
 import javax.servlet.http.HttpServletRequest;
 import java.time.LocalDateTime;
+import java.util.List;
 
 /**
  * <p>
@@ -46,6 +51,9 @@ public class TaPolicyController extends BaseController {
     @Autowired
     public ITaPolicyService iTaPolicyService;
 
+    @Autowired
+    public ITaPolicyTypeService iTaPolicyTypeService;
+
     @Autowired
     private ITdCityService iTdCityService;
 
@@ -78,6 +86,14 @@ public class TaPolicyController extends BaseController {
             queryWrapper.eq("org_id", getOrgId(request));
 
             IPage<TaPolicy> result = iTaPolicyService.page(pg, queryWrapper);
+            List<TaPolicy> records = result.getRecords();
+            records.forEach(e -> {
+                TaPolicyType policyType = iTaPolicyTypeService.getById(e.getPolicyTypeId());
+                if (null != policyType) {
+                    e.setPolicyTypeName(policyType.getPolicyTypeName());
+                }
+
+            });
             responseBean.addSuccess(result);
         }catch (Exception e){
             logger.error("taPolicyList -=- {}",e.toString());

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

@@ -1,6 +1,7 @@
 package com.yunzhi.marketing.entity;
 
 import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import java.time.LocalDateTime;
 import java.io.Serializable;
@@ -31,6 +32,9 @@ public class TaPolicy implements Serializable {
 
     private String policyTypeId;
 
+    @TableField(exist = false)
+    private String policyTypeName;
+
     /**
      * 政策标题
      */

src/main/java/com/yunzhi/marketing/mapper/TaBuildingMapper.java

@@ -181,4 +181,11 @@ public interface TaBuildingMapper extends BaseMapper<TaBuilding> {
      * @return
      */
     IPage<StatsTimeBuilding> getStatsTimeTableList(IPage<StatsTimeBuilding> pg,@Param("orgId") Integer orgId,@Param("startDate") LocalDate startDate,@Param("endDate") LocalDate endDate,@Param("buildingId") String buildingId,@Param("sortField") String sortField,@Param("orderType") String orderType);
+
+    /**
+     * 获取我有权限的楼盘
+     * @param userId
+     * @return
+     */
+    List<TaBuilding> selectByUserId(Integer userId);
 }

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

@@ -175,4 +175,11 @@ public interface ITaBuildingService extends IService<TaBuilding> {
      * @return
      */
     ResponseBean getMarketingList(Integer pageNum, Integer pageSize, String buildingId);
+
+    /**
+     * 拥有权限的楼盘
+     * @param userId
+     * @return
+     */
+    List<TaBuilding> selectByUserId(Integer userId);
 }

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

@@ -1203,4 +1203,15 @@ public class TaBuildingServiceImpl extends ServiceImpl<TaBuildingMapper, TaBuild
         IPage<TaPerson> personList = taPersonMapper.getMarketingList(page,buildingId);
         return ResponseBean.success(personList);
     }
+
+    /**
+     * 拥有权限的楼盘
+     *
+     * @param userId
+     * @return
+     */
+    @Override
+    public List<TaBuilding> selectByUserId(Integer userId) {
+        return taBuildingMapper.selectByUserId(userId);
+    }
 }

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

@@ -0,0 +1,143 @@
+package com.yunzhi.marketing.xlk.controller;
+
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.yunzhi.marketing.base.BaseController;
+import com.yunzhi.marketing.base.ResponseBean;
+import com.yunzhi.marketing.xlk.entity.UserInstitution;
+import com.yunzhi.marketing.xlk.service.IUserInstitutionService;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+/**
+ * <p>
+    * 用户组织机构表  前端控制器
+    * </p>
+ *
+ * @author jobob
+ * @since 2021-07-23
+ */
+@RestController
+@RequestMapping("/")
+public class UserInstitutionController extends BaseController {
+
+    private final Logger logger = LoggerFactory.getLogger(UserInstitutionController.class);
+
+    @Autowired
+    public IUserInstitutionService iUserInstitutionService;
+
+
+    /**
+     * 分页查询列表
+     * @param pageNum
+     * @param pageSize
+     * @return
+     */
+    @RequestMapping(value="/userInstitution",method= RequestMethod.GET)
+    public ResponseBean userInstitutionList(@RequestParam(value ="pageNum",defaultValue = "1") Integer pageNum,
+                                            @RequestParam(value ="pageSize",defaultValue = "10") Integer pageSize){
+        ResponseBean responseBean = new ResponseBean();
+        try {
+            //使用分页插件
+		    IPage<UserInstitution> pg = new Page<>(pageNum, pageSize);
+            QueryWrapper<UserInstitution> queryWrapper = new QueryWrapper<>();
+            queryWrapper.orderByDesc("create_date");
+
+            IPage<UserInstitution> result = iUserInstitutionService.page(pg, queryWrapper);
+            responseBean.addSuccess(result);
+        }catch (Exception e){
+            e.printStackTrace();
+            logger.error("userInstitutionList -=- {}",e.toString());
+            responseBean.addError(e.getMessage());
+        }
+        return responseBean;
+    }
+
+    /**
+     * 保存对象
+     * @param userInstitution 实体对象
+     * @return
+     */
+    @RequestMapping(value="/userInstitution",method= RequestMethod.POST)
+    public ResponseBean userInstitutionAdd(@RequestBody UserInstitution userInstitution){
+        ResponseBean responseBean = new ResponseBean();
+        try {
+            if (iUserInstitutionService.save(userInstitution)){
+                responseBean.addSuccess(userInstitution);
+            }else {
+                responseBean.addError("fail");
+            }
+        }catch (Exception e){
+            e.printStackTrace();
+            logger.error("userInstitutionAdd -=- {}",e.toString());
+            responseBean.addError(e.getMessage());
+        }
+        return responseBean;
+    }
+
+    /**
+     * 根据id删除对象
+     * @param id  实体ID
+     */
+    @ResponseBody
+    @RequestMapping(value="/userInstitution/{id}", method= RequestMethod.DELETE)
+    public ResponseBean userInstitutionDelete(@PathVariable Integer id){
+        ResponseBean responseBean = new ResponseBean();
+        try {
+            if(iUserInstitutionService.removeById(id)){
+                responseBean.addSuccess("success");
+            }else {
+                responseBean.addError("fail");
+            }
+        }catch (Exception e){
+            e.printStackTrace();
+            logger.error("userInstitutionDelete -=- {}",e.toString());
+            responseBean.addError(e.getMessage());
+        }
+        return responseBean;
+    }
+
+    /**
+     * 修改对象
+     * @param id  实体ID
+     * @param userInstitution 实体对象
+     * @return
+     */
+    @RequestMapping(value="/userInstitution/{id}",method= RequestMethod.PUT)
+    public ResponseBean userInstitutionUpdate(@PathVariable Integer id,
+                                        @RequestBody UserInstitution userInstitution){
+        ResponseBean responseBean = new ResponseBean();
+        try {
+            if (iUserInstitutionService.updateById(userInstitution)){
+                responseBean.addSuccess(userInstitution);
+            }else {
+                responseBean.addError("fail");
+            }
+        }catch (Exception e){
+            e.printStackTrace();
+            logger.error("userInstitutionUpdate -=- {}",e.toString());
+            responseBean.addError(e.getMessage());
+        }
+        return responseBean;
+    }
+
+    /**
+     * 根据id查询对象
+     * @param id  实体ID
+     */
+    @RequestMapping(value="/userInstitution/{id}",method= RequestMethod.GET)
+    public ResponseBean userInstitutionGet(@PathVariable Integer id){
+        ResponseBean responseBean = new ResponseBean();
+        try {
+            responseBean.addSuccess(iUserInstitutionService.getById(id));
+        }catch (Exception e){
+            e.printStackTrace();
+            logger.error("userInstitutionDelete -=- {}",e.toString());
+            responseBean.addError(e.getMessage());
+        }
+        return responseBean;
+    }
+}

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

@@ -7,7 +7,9 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.yunzhi.marketing.base.BaseController;
 import com.yunzhi.marketing.base.ResponseBean;
 import com.yunzhi.marketing.common.StringUtils;
+import com.yunzhi.marketing.entity.TaBuilding;
 import com.yunzhi.marketing.entity.TaPerson;
+import com.yunzhi.marketing.service.ITaBuildingService;
 import com.yunzhi.marketing.xlk.dto.SearchHouseDTO;
 import com.yunzhi.marketing.xlk.dto.VideoDTO;
 import com.yunzhi.marketing.xlk.entity.Brand;
@@ -52,6 +54,9 @@ public class VideoController extends BaseController {
     @Autowired
     public IVideoService iVideoService;
 
+    @Autowired
+    private ITaBuildingService taBuildingService;
+
 
     /**
      * 分页查询列表
@@ -76,6 +81,13 @@ public class VideoController extends BaseController {
             queryWrapper.orderByDesc(Video::getCreatedTime);
 
             IPage<Video> result = iVideoService.page(pg, queryWrapper);
+            List<Video> records = result.getRecords();
+            records.forEach(e -> {
+                TaBuilding building = taBuildingService.getById(e.getBuildingId());
+                if (null != building) {
+                    e.setBuildingName(building.getBuildingName());
+                }
+            });
             responseBean.addSuccess(result);
         }catch (Exception e){
             e.printStackTrace();

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

@@ -0,0 +1,56 @@
+package com.yunzhi.marketing.xlk.entity;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+import java.io.Serializable;
+import java.time.LocalDateTime;
+
+/**
+ * <p>
+ * 用户组织机构表 
+ * </p>
+ *
+ * @author jobob
+ * @since 2021-07-23
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+@TableName("xlk_user_institution")
+public class UserInstitution implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 用户组织架构id
+     */
+    @TableId(type = IdType.UUID)
+    private String userInstitutionId;
+
+    /**
+     * 创建时间
+     */
+    private LocalDateTime createDate;
+
+    /**
+     * 公司id
+     */
+    private Integer orgId;
+
+    /**
+     * 用户id
+     */
+    private Integer userId;
+
+    /**
+     * 组织机构id
+     */
+    private String institutionId;
+
+
+}

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

@@ -76,6 +76,12 @@ public class Video implements Serializable {
     @TableField("BUILDING_ID")
     private String buildingId;
 
+    /**
+     * 所属楼盘
+     */
+    @TableField(exist = false)
+    private String buildingName;
+
     /**
      * 主图
      */

src/main/java/com/yunzhi/marketing/xlk/mapper/UserInstitutionMapper.java

@@ -0,0 +1,18 @@
+package com.yunzhi.marketing.xlk.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.yunzhi.marketing.xlk.entity.UserInstitution;
+import org.apache.ibatis.annotations.Mapper;
+
+/**
+ * <p>
+ * 用户组织机构表  Mapper 接口
+ * </p>
+ *
+ * @author jobob
+ * @since 2021-07-23
+ */
+@Mapper
+public interface UserInstitutionMapper extends BaseMapper<UserInstitution> {
+
+}

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

@@ -0,0 +1,16 @@
+package com.yunzhi.marketing.xlk.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.yunzhi.marketing.xlk.entity.UserInstitution;
+
+/**
+ * <p>
+ * 用户组织机构表  服务类
+ * </p>
+ *
+ * @author jobob
+ * @since 2021-07-23
+ */
+public interface IUserInstitutionService extends IService<UserInstitution> {
+
+}

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

@@ -0,0 +1,20 @@
+package com.yunzhi.marketing.xlk.service.impl;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.yunzhi.marketing.xlk.entity.UserInstitution;
+import com.yunzhi.marketing.xlk.mapper.UserInstitutionMapper;
+import com.yunzhi.marketing.xlk.service.IUserInstitutionService;
+import org.springframework.stereotype.Service;
+
+/**
+ * <p>
+ * 用户组织机构表  服务实现类
+ * </p>
+ *
+ * @author jobob
+ * @since 2021-07-23
+ */
+@Service
+public class UserInstitutionServiceImpl extends ServiceImpl<UserInstitutionMapper, UserInstitution> implements IUserInstitutionService {
+
+}

src/main/resources/mapper/TaBuildingMapper.xml

@@ -742,5 +742,17 @@
         </if>
         create_date desc
     </select>
+    <select id="selectByUserId" resultType="com.yunzhi.marketing.entity.TaBuilding">
+        SELECT
+        *
+        FROM
+        ta_building b
+        WHERE b.institution_id in (SELECT
+        i.institution_id
+        FROM
+        xlk_institution i
+        INNER JOIN ( SELECT x.institution_code FROM xlk_user_institution t LEFT JOIN xlk_institution x ON t.institution_id = x.institution_id WHERE t.user_id = #{userId}) g ON i.institution_code LIKE g.institution_code
+        )
+    </select>
 
 </mapper>

src/main/resources/mapper/xlk/UserInstitutionMapper.xml

@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.yunzhi.marketing.xlk.mapper.UserInstitutionMapper">
+
+</mapper>