员工列表和楼盘下拉选框后台改造

src/main/java/com/huiju/estateagents/center/taUser/controller/TaUserController.java

@@ -427,9 +427,18 @@ public class TaUserController extends BaseController {
             taUser.setLoginPassword("");
             QueryWrapper<TaPersonBuilding> taPersonBuildingQueryWrapper = new QueryWrapper<>();
             taPersonBuildingQueryWrapper.eq("user_id",taUser.getUserId());
-            TaPersonBuilding taPersonBuilding = taPersonBuildingService.getOne(taPersonBuildingQueryWrapper);
-            if (null != taPersonBuilding){
-                taUser.setBuildingId(taPersonBuilding.getBuildingId());
+            List<TaPersonBuilding> taPersonBuildingList = taPersonBuildingService.list(taPersonBuildingQueryWrapper);
+            //非置业顾问可以授权多个项目
+            if (taPersonBuildingList.size() > 0){
+                if (taUser.getIsConsultant()){
+                    taUser.setBuildingId(taPersonBuildingList.get(0).getBuildingId());
+                }else {
+                    List<String> buildings = new ArrayList<>();
+                    taPersonBuildingList.forEach(e -> {
+                        buildings.add(e.getBuildingId());
+                    });
+                    taUser.setBuildingIds(buildings);
+                }
             }
             responseBean.addSuccess(taUser);
         }catch (Exception e){

src/main/java/com/huiju/estateagents/center/taUser/entity/TaUser.java

@@ -198,4 +198,7 @@ public class TaUser implements Serializable {
      */
     @TableField(exist = false)
     private Integer miniStatus;
+
+    @TableField(exist = false)
+    private List<String> buildingIds = new ArrayList<String>();
 }

src/main/java/com/huiju/estateagents/center/taUser/service/impl/TaUserServiceImpl.java

@@ -364,11 +364,25 @@ public class TaUserServiceImpl extends ServiceImpl<TaUserMapper, TaUser> impleme
 		});
 		
 		//保存项目
-		TaPersonBuilding taPersonBuilding = new TaPersonBuilding();
-		taPersonBuilding.setBuildingId(taUser.getBuildingId());
-		taPersonBuilding.setUserId(taUser.getUserId());
-		taPersonBuilding.setCreateDate(LocalDateTime.now());
-		taPersonBuildingMapper.insert(taPersonBuilding);
+		if (taUser.getIsConsultant()){
+			TaPersonBuilding taPersonBuilding = new TaPersonBuilding();
+			taPersonBuilding.setBuildingId(taUser.getBuildingId());
+			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);
+			});
+		}
+
 		return taUser;
 	}
 	
@@ -424,11 +438,24 @@ public class TaUserServiceImpl extends ServiceImpl<TaUserMapper, TaUser> impleme
 		taPersonBuildingQueryWrapper.eq("user_id",taUser.getUserId());
 		taPersonBuildingMapper.delete(taPersonBuildingQueryWrapper);
 		//保存项目
-		TaPersonBuilding taPersonBuilding = new TaPersonBuilding();
-		taPersonBuilding.setBuildingId(taUser.getBuildingId());
-		taPersonBuilding.setUserId(taUser.getUserId());
-		taPersonBuilding.setCreateDate(LocalDateTime.now());
-		taPersonBuildingMapper.insert(taPersonBuilding);
+		if (taUser.getIsConsultant()){
+			TaPersonBuilding taPersonBuilding = new TaPersonBuilding();
+			taPersonBuilding.setBuildingId(taUser.getBuildingId());
+			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);
+			});
+		}
 		
 		//更新person
 		TaPerson taPerson = new TaPerson();

src/main/java/com/huiju/estateagents/controller/TaBuildingController.java

@@ -141,7 +141,7 @@ public class TaBuildingController extends BaseController {
                                      @RequestParam(value = "cityId",required = false)Integer cityId,
                                      @RequestParam(value = "isMain",required = false)Integer isMain,
                                            HttpServletRequest request){
-        return taBuildingService.buildingListSelect(pageNum,pageSize,name,code,startDate,buildingStatus,marketStatus,cityId,isMain,getOrgId(request));
+        return taBuildingService.buildingListSelect(pageNum,pageSize,name,code,startDate,buildingStatus,marketStatus,cityId,isMain,getOrgId(request),getUserId(request));
     }
 
     /**

src/main/java/com/huiju/estateagents/mapper/TaBuildingMapper.java

@@ -1,12 +1,11 @@
 package com.huiju.estateagents.mapper;
 
 import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.huiju.estateagents.entity.TaBuilding;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.huiju.estateagents.entity.TaPersonBuilding;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
-import org.apache.ibatis.annotations.Select;
 import org.apache.ibatis.annotations.Update;
 
 import java.time.LocalDateTime;
@@ -33,9 +32,10 @@ public interface TaBuildingMapper extends BaseMapper<TaBuilding> {
     /**
      * 楼盘列表
      * @param page
+     * @param
      * @return
      */
-    List<TaBuilding> buildingListSelect(IPage<TaBuilding> page, @Param("Name") String name, @Param("Code")String code,@Param("startDate")LocalDateTime startDate, @Param("buildingStatus")String buildingStatus, @Param("marketStatus")String marketStatus, @Param("cityId")Integer cityId, @Param("isMain")Integer isMain,@Param("orgId") Integer orgId);
+    List<TaBuilding> buildingListSelect(IPage<TaBuilding> page, @Param("Name") String name, @Param("Code") String code, @Param("startDate") LocalDateTime startDate, @Param("buildingStatus") String buildingStatus, @Param("marketStatus") String marketStatus, @Param("cityId") Integer cityId, @Param("isMain") Integer isMain, @Param("orgId") Integer orgId, @Param("personBuildingList") List<TaPersonBuilding> personBuildingList);
 
 
     @Update("UPDATE ta_building  SET ${field} = IFNULL(${field}, 0) + #{increment}  WHERE building_id = #{buildingId}")

src/main/java/com/huiju/estateagents/service/ITaBuildingService.java

@@ -31,7 +31,7 @@ public interface ITaBuildingService extends IService<TaBuilding> {
      * @param pageSize
      * @return
      */
-    ResponseBean buildingListSelect(Integer pageNum, Integer pageSize, String name, String code, LocalDateTime startDate, String buildingStatus, String marketStatus, Integer cityId, Integer isMain,Integer orgId);
+    ResponseBean buildingListSelect(Integer pageNum, Integer pageSize, String name, String code, LocalDateTime startDate, String buildingStatus, String marketStatus, Integer cityId, Integer isMain,Integer orgId,Integer userId);
 
     /**
      * 楼盘详情

src/main/java/com/huiju/estateagents/service/impl/TaBuildingServiceImpl.java

@@ -8,6 +8,8 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.google.common.collect.Lists;
 import com.huiju.estateagents.base.ResponseBean;
+import com.huiju.estateagents.center.taUser.entity.TaUser;
+import com.huiju.estateagents.center.taUser.mapper.TaUserMapper;
 import com.huiju.estateagents.common.CommConstant;
 import com.huiju.estateagents.common.DateUtils;
 import com.huiju.estateagents.common.StringUtils;
@@ -88,6 +90,12 @@ public class TaBuildingServiceImpl extends ServiceImpl<TaBuildingMapper, TaBuild
     @Autowired
     private ITaBuildingMapRelationService iTaBuildingMapRelationService;
 
+    @Autowired
+    private TaUserMapper taUserMapper;
+
+    @Autowired
+    private TaPersonBuildingMapper taPersonBuildingMapper;
+
     @Override
     public ResponseBean buildingList(Integer pageNum, Integer pageSize, String name, String code, LocalDateTime startDate, String buildingStatus, String marketStatus, Integer cityId, Integer isMain, Integer orgId) {
         Page<TaBuilding> page = new Page<>();
@@ -123,11 +131,18 @@ public class TaBuildingServiceImpl extends ServiceImpl<TaBuildingMapper, TaBuild
         return ResponseBean.success(page);
     }
     @Override
-    public ResponseBean buildingListSelect(Integer pageNum, Integer pageSize, String name, String code, LocalDateTime startDate, String buildingStatus, String marketStatus, Integer cityId, Integer isMain,Integer orgId) {
+    public ResponseBean buildingListSelect(Integer pageNum, Integer pageSize, String name, String code, LocalDateTime startDate, String buildingStatus, String marketStatus, Integer cityId, Integer isMain,Integer orgId,Integer userId) {
         Page<TaBuilding> page = new Page<>();
         page.setSize(pageSize == null ? 10 : pageSize);
         page.setCurrent(pageNum == null ? 1 : pageNum);
-        List<TaBuilding> building = taBuildingMapper.buildingListSelect(page, name, code,startDate,buildingStatus,marketStatus,cityId,isMain,orgId);
+        TaUser taUser = taUserMapper.selectById(userId);
+        QueryWrapper<TaPersonBuilding> taPersonBuildingQueryWrapper = new QueryWrapper<>();
+        taPersonBuildingQueryWrapper.eq("user_id",taUser.getUserId());
+        List<TaPersonBuilding> taPersonBuildingList = taPersonBuildingMapper.selectList(taPersonBuildingQueryWrapper);
+        if (null != taUser.getIsAdmin() && taUser.getIsAdmin()){
+            taPersonBuildingList = new ArrayList<>();
+        }
+        List<TaBuilding> building = taBuildingMapper.buildingListSelect(page, name, code,startDate,buildingStatus,marketStatus,cityId,isMain,orgId,taPersonBuildingList);
         page.setRecords(building);
 
         return ResponseBean.success(page);

src/main/resources/mapper/TaBuildingMapper.xml

@@ -59,6 +59,12 @@
             <if test="orgId != null and orgId != ''">
                 and  ta_building.org_id = #{orgId}
             </if>
+            <if test="personBuildingList != null and personBuildingList.size > 0">
+                AND ta_building.building_id in
+                <foreach collection="personBuildingList" item="personBuilding" open="(" close=")" separator=",">
+                    #{personBuilding.buildingId}
+                </foreach>
+            </if>
         </where>
         ORDER BY create_date DESC,status asc
     </select>