bug修复

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

@@ -8,10 +8,8 @@ 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.model.Result;
-import com.ljq.house.biz.model.TmAdmin;
-import com.ljq.house.biz.model.TmAgency;
-import com.ljq.house.biz.model.TmHouseAgencyRelation;
+import com.ljq.house.biz.dao.TmStoreDao;
+import com.ljq.house.biz.model.*;
 import com.ljq.house.biz.vo.request.DeleteRequestVo;
 import com.ljq.house.biz.vo.response.TmAgencyRspVo;
 import com.ljq.house.common.enums.IdStarterEnum;
@@ -51,6 +49,9 @@ public class AdminTmAgencyController {
     private TmAgencyDao tmAgencyDao;
 
     @Autowired
+    private TmStoreDao tmStoreDao;
+
+    @Autowired
     private TmHouseAgencyRelationDao tmHouseAgencyRelationDao;
 
     @Autowired
@@ -133,6 +134,9 @@ public class AdminTmAgencyController {
                    //单独去获取关联的房源数、用户数
                    tmAgencyRspVo.setHouseNum(tmHouseAgencyRelationDao.countRelationHouse(tmAgency.getAgencyUserId()));
                    tmAgencyRspVo.setUserNum(tmAgencyUserRelationDao.countRelationUser(tmAgency.getAgencyUserId()));
+                   //获取房源名称
+                   TmStore tmStore = tmStoreDao.getStoreInfo(Integer.valueOf(tmAgencyRspVo.getStoreId()));
+                   tmAgencyRspVo.setStore(tmStore.getName());
                    listAgency.add(tmAgencyRspVo);
             }
         }

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

@@ -420,7 +420,7 @@ public class AdminTmHouseController {
             constantQuery.put("house.estate_name", estateName);
         }
 
-        DataUtils.assembleTimeQueryWrapper(constantQuery, queryName, houseQueryWrapper, "house.house_id", "house.title", "relation.name");
+        DataUtils.assembleTimeQueryWrapper(constantQuery, queryName, houseQueryWrapper, "", "house.title", "relation.name");
 
         houseQueryWrapper.orderByDesc("house.create_time");
 

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

@@ -139,7 +139,8 @@ public class SysDeptController {
     @ResponseBody
     @RequiresRoles(value = {"super_admin","normal_admin","sub_normal_admin"},logical = Logical.OR)
     public Result getAdminListWithAuth(@RequestParam(name = "page_num") Long pageNum,
-                                       @RequestParam(name = "page_size") Long pageSize) {
+                                       @RequestParam(name = "page_size") Long pageSize,
+                                       @RequestParam(name = "searchKey") String searchKey) {
 
         if(null == pageNum || null == pageSize){
             throw new CommonBaseException(ResultCodeEnum.D101 , "页码或者页面大小不能为空");
@@ -164,6 +165,7 @@ public class SysDeptController {
 
         IPage<SysDept> page = new Page<>(pageNum , pageSize);
         queryWrapper.eq("del_flag" , 0);
+        queryWrapper.like("name",searchKey);
         queryWrapper.orderByDesc("dept_id");
         IPage<SysDept> resultPage = new Page<>();
         resultPage = sysDeptDao.selectPage(page , queryWrapper);