bug 修复

house-biz/src/main/java/com/ljq/house/biz/dao/SysDeptDao.java

@@ -2,6 +2,7 @@ package com.ljq.house.biz.dao;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.ljq.house.biz.model.SysDept;
+import org.apache.ibatis.annotations.Param;
 
 /**
  * <p>
@@ -12,5 +13,5 @@ import com.ljq.house.biz.model.SysDept;
  * @since 2020-05-26
  */
 public interface SysDeptDao extends BaseMapper<SysDept> {
-
+    SysDept getCompareInfo(@Param("id") Integer id);
 }

house-biz/src/main/resources/mapper/SysDeptDao.xml

@@ -2,7 +2,11 @@
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.ljq.house.biz.dao.SysDeptDao">
 
-
+    <select id="getCompareInfo" resultType="com.ljq.house.biz.model.SysDept">
+        select  *
+        from sys_dept
+        where dept_id = #{id}
+    </select>
 
 
 

house-common/src/main/java/com/ljq/house/common/enums/ResultCodeEnum.java

@@ -54,6 +54,8 @@ public enum ResultCodeEnum {
     D045(3048 , "该手机号已注册",true),
     D046(3049 , "用户不存在",true),
 
+    D050(3050 , "经纪人有关联房源，不能删除",true),
+
 
     D100(3100 , "系统异常",true),
     D101(3101 , "数据异常",true),

house-common/src/main/java/com/ljq/house/common/service/HouseHelperService.java

@@ -36,6 +36,12 @@ public class HouseHelperService {
     private TmUserDao tmUserDao;
 
     @Autowired
+    private TmStoreDao tmStoreDao;
+
+    @Autowired
+    private SysDeptDao sysDeptDao;
+
+    @Autowired
     private TmHouseAgencyRelationDao agencyRelationDao;
 
     @Autowired
@@ -66,6 +72,21 @@ public class HouseHelperService {
             agencyQueryWrapper.eq("agency_user_id" , houseAgencyRelation.getAgencyUserId());
             agencyQueryWrapper.last("limit 1");
             tmAgency = tmAgencyDao.selectOne(agencyQueryWrapper);
+            //获取stroe 名称
+            if(tmAgency.getStoreId()!=null){
+                TmStore tmStore = tmStoreDao.getStoreInfo(Integer.valueOf(tmAgency.getStoreId()));
+                tmAgency.setStore(tmStore.getName());
+            }
+
+            //获取公司
+            if(tmAgency.getAgencyCompanyId()!=null){
+                SysDept sysDept = sysDeptDao.getCompareInfo(Integer.valueOf(tmAgency.getAgencyCompanyId()));
+                if(sysDept!=null){
+                    tmAgency.setAgencyCompanyName(sysDept.getName());
+                }else{
+                    tmAgency.setAgencyCompanyName("");
+                }
+            }
         }
         TmUser tmUser = new TmUser();
         if(StringUtils.isNoneBlank(userId)){

house-web/src/main/java/com/ljq/house/admin/controller/AdminTmAgencyController.java

@@ -5,10 +5,7 @@ import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.ljq.house.auth.utils.ShiroUtils;
-import com.ljq.house.biz.dao.TmAgencyDao;
-import com.ljq.house.biz.dao.TmAgencyUserRelationDao;
-import com.ljq.house.biz.dao.TmHouseAgencyRelationDao;
-import com.ljq.house.biz.dao.TmStoreDao;
+import com.ljq.house.biz.dao.*;
 import com.ljq.house.biz.model.*;
 import com.ljq.house.biz.vo.request.DeleteRequestVo;
 import com.ljq.house.biz.vo.response.TmAgencyRspVo;
@@ -52,6 +49,9 @@ public class AdminTmAgencyController {
     private TmStoreDao tmStoreDao;
 
     @Autowired
+    private SysDeptDao sysDeptDao;
+
+    @Autowired
     private TmHouseAgencyRelationDao tmHouseAgencyRelationDao;
 
     @Autowired
@@ -117,7 +117,7 @@ public class AdminTmAgencyController {
         }
         //keyword是动态查询条件，动态去匹配agency_user_id 、 name 、phone这三个字段，因为是用了like操作，所以需要添加索引
         //TODO:防止慢查询
-        DataUtils.assembleTimeQueryWrapper(constantReq, keyword, queryWrapper, "agency_user_id", "name", "phone");
+        DataUtils.assembleTimeQueryWrapper(constantReq, keyword, queryWrapper, "", "name", "phone");
 
         //页面配置入参
         Page<TmAgency> page = new Page(pageNum, pageSize);
@@ -134,11 +134,21 @@ public class AdminTmAgencyController {
                    //单独去获取关联的房源数、用户数
                    tmAgencyRspVo.setHouseNum(tmHouseAgencyRelationDao.countRelationHouse(tmAgency.getAgencyUserId()));
                    tmAgencyRspVo.setUserNum(tmAgencyUserRelationDao.countRelationUser(tmAgency.getAgencyUserId()));
-                   //获取房源名称
+                    //获取stroe 名称
                     if(tmAgencyRspVo.getStoreId()!=null){
                         TmStore tmStore = tmStoreDao.getStoreInfo(Integer.valueOf(tmAgencyRspVo.getStoreId()));
                         tmAgencyRspVo.setStore(tmStore.getName());
                     }
+
+                    //获取公司
+                   if(tmAgencyRspVo.getAgencyCompanyId()!=null){
+                      SysDept sysDept = sysDeptDao.getCompareInfo(Integer.valueOf(tmAgencyRspVo.getAgencyCompanyId()));
+                      if(sysDept!=null){
+                          tmAgencyRspVo.setAgencyCompanyName(sysDept.getName());
+                      }else{
+                          tmAgencyRspVo.setAgencyCompanyName("");
+                      }
+                    }
                    listAgency.add(tmAgencyRspVo);
             }
         }
@@ -152,8 +162,6 @@ public class AdminTmAgencyController {
                 totalResult.getCurrent(), totalResult.getRecords()));
     }
 
-
-
     @ApiOperation(value = "修改经纪人信息")
     @PostMapping("/update")
     @ResponseBody
@@ -274,6 +282,10 @@ public class AdminTmAgencyController {
 
         if(!CollectionUtils.isEmpty(requestVo.getStrIds())){
             for (String id : requestVo.getStrIds()){
+                int num = tmHouseAgencyRelationDao.countRelationHouse(id);
+                if(num > 0){
+                    throw new CommonBaseException(ResultCodeEnum.D050);
+                }
                 UpdateWrapper<TmAgency> updateWrapper = new UpdateWrapper<>();
                 TmAgency tmAgency = new TmAgency();
                 tmAgency.setEnable(0);

house-web/src/main/java/com/ljq/house/admin/controller/AdminTmHouseController.java

@@ -123,7 +123,7 @@ public class AdminTmHouseController {
     )
     @GetMapping("/house")
     @ResponseBody
-    @RequiresRoles(value = {"super_admin","normal_admin","agency"},logical = Logical.OR)
+    @RequiresRoles(value = {"super_admin","normal_admin","agency","sub_normal_admin"},logical = Logical.OR)
     public Result getHousesDetailById(HttpServletRequest req) {
         String houseId = req.getParameter("house_id");
         if (StringUtils.isBlank(houseId)) {
@@ -139,7 +139,7 @@ public class AdminTmHouseController {
     @ApiOperation(value = "修改房源信息")
     @PostMapping("/update")
     @ResponseBody
-    @RequiresRoles(value = {"super_admin","normal_admin","agency"},logical = Logical.OR)
+    @RequiresRoles(value = {"super_admin","normal_admin","agency","sub_normal_admin"},logical = Logical.OR)
     public Result updateHouseInfo(@RequestBody @ApiParam(name = "房源对象", value = "传入json格式", required = true) TmHouse tmHouse) {
         if (null == tmHouse || StringUtils.isBlank(tmHouse.getHouseId())) {
             throw new CommonBaseException(ResultCodeEnum.D017);
@@ -178,7 +178,7 @@ public class AdminTmHouseController {
     @PostMapping("/attachAgency")
     @ResponseBody
     @Transactional(rollbackFor = Exception.class)
-    @RequiresRoles(value = {"super_admin","normal_admin","agency"},logical = Logical.OR)
+    @RequiresRoles(value = {"super_admin","normal_admin","agency","sub_normal_admin"},logical = Logical.OR)
     public Result attachAgency(@RequestBody @ApiParam(name = "房源关联经纪人请求体", value = "传入json格式", required = true) HouseAttachAgencyVO houseAttachAgencyVO) {
         if (null == houseAttachAgencyVO) {
             throw new CommonBaseException(ResultCodeEnum.D017);
@@ -295,7 +295,7 @@ public class AdminTmHouseController {
     @ApiOperation(value = "上传视频")
     @PostMapping("/upLoadVideo")
     @ResponseBody
-    @RequiresRoles(value = {"super_admin","normal_admin","agency"},logical = Logical.OR)
+    @RequiresRoles(value = {"super_admin","normal_admin","agency","sub_normal_admin"},logical = Logical.OR)
     public Result uploadIntroduceVideo(@RequestParam("file") MultipartFile file) {
         if (null == file) {
             throw new CommonBaseException(ResultCodeEnum.D017);