1、客源无法添加、2、公司无法添加

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

@@ -49,6 +49,7 @@
     <select id="selectTmAgencyById" resultType="com.ljq.house.biz.model.TmAgency">
         select * from tm_agency
         <where>
+            enable = 1
             <if test="agencyUserId != null and agencyUserId.trim() != '' ">
                 and agency_user_id = #{agencyUserId}
             </if>

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

@@ -44,6 +44,7 @@
     <select id="selectHouseById" resultType="com.ljq.house.biz.model.TmHouse">
         select * from tm_house
         <where>
+            enable = 1
             <if test="houseId != null and houseId != '' ">
                 and house_id = #{houseId}
             </if>
@@ -67,6 +68,7 @@
             house.create_time,
             house.enable,
             house.is_show,
+            house.property_number AS propertyNumber,
             relation.agency_user_id as agency_user_id,
             relation.name as name
         from tm_house house

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

@@ -101,7 +101,8 @@ public class AdminTmAgencyController {
                 log.error("用户未分配归属部门");
                 return Result.success();
             }
-            queryWrapper.eq("CREATE_USER_DEPT_ID" , user.getDeptId());
+//            queryWrapper.eq("CREATE_USER_DEPT_ID" , user.getDeptId());
+            queryWrapper.eq("agency_company_id", user.getDeptId());
         }
 
         Map<String, Object> constantReq = new HashMap<>();
@@ -151,6 +152,12 @@ public class AdminTmAgencyController {
         if (null == tmAgency && StringUtils.isBlank(tmAgency.getAgencyUserId())) {
             throw new CommonBaseException(ResultCodeEnum.D017);
         }
+
+        TmAdmin user = ShiroUtils.getAdmin();
+        if(user!=null){
+            tmAgency.setUpdateUserId(user.getAdminId());
+        }
+
         UpdateWrapper<TmAgency> updateWrapper = new UpdateWrapper<>();
         updateWrapper.eq("agency_user_id" , tmAgency.getAgencyUserId());
         updateWrapper.last("limit 1");

house-web/src/main/java/com/ljq/house/app/controller/AppAgencyController.java

@@ -241,12 +241,12 @@ public class AppAgencyController {
     @PostMapping(value = "/update/customer")
     @ResponseBody
     public Result updateAgencyCustomer(@RequestBody @ApiParam(name="经纪人下的客源对象",value="传入json格式",required=true)TmAgencyUserRelation agencyUserRelation) {
-        if (null == agencyUserRelation || !StringUtils.isNoneBlank(agencyUserRelation.getUserId() ,agencyUserRelation.getAgencyUserId())) {
-           throw new CommonBaseException(ResultCodeEnum.D017, "经纪人id和用户id都不能为空");
+        if (null == agencyUserRelation || null == agencyUserRelation.getId() || !StringUtils.isNoneBlank(agencyUserRelation.getAgencyUserId())) {
+           throw new CommonBaseException(ResultCodeEnum.D017, "经纪人id和 客户信息id 都不能为空");
         }
         QueryWrapper<TmAgencyUserRelation> userRelationQueryWrapper = new QueryWrapper<>();
-        userRelationQueryWrapper.eq("agency_user_id" , agencyUserRelation.getAgencyUserId());
-        userRelationQueryWrapper.eq("user_id" , agencyUserRelation.getUserId());
+//        userRelationQueryWrapper.eq("agency_user_id" , agencyUserRelation.getAgencyUserId());
+        userRelationQueryWrapper.eq("id" , agencyUserRelation.getId());
         userRelationQueryWrapper.last("limit 1");
         TmAgencyUserRelation dbAgencyRelation = agencyUserRelationDao.selectOne(userRelationQueryWrapper);
         if(null == dbAgencyRelation){

house-web/src/main/java/com/ljq/house/app/controller/AppTmHouseController.java

@@ -276,6 +276,7 @@ public class AppTmHouseController {
         return Result.success(DataUtils.assembleResult(iPage.getTotal(), iPage.getPages(), iPage.getCurrent(), iPage.getRecords()));
     }
 
+
     @RequestMapping(value = "/agencyHouse", method = RequestMethod.GET)
     @ResponseBody
     public Result getAgencyHouseList(HttpServletRequest req) {
@@ -483,9 +484,6 @@ public class AppTmHouseController {
             String orientation = request.getParameter("orientation");
             String elevator = request.getParameter("elevator");
             String title = request.getParameter("title");
-            log.info("----title:", title);
-            System.out.println("----title:"+ title);
-            String title2 = request.getParameter("title");
             String roomsRange = request.getParameter("room_s");
             String priceRange = request.getParameter("price_s");
             Integer saleState = DataUtils.getInteger(request.getParameter("saleState"));