员工列表改造

src/main/java/com/huiju/estateagents/base/BaseController.java

@@ -1,8 +1,16 @@
 package com.huiju.estateagents.base;
 
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.huiju.estateagents.center.taUser.entity.TaUser;
+import com.huiju.estateagents.center.taUser.service.ITaUserService;
 import com.huiju.estateagents.common.JWTUtils;
+import com.huiju.estateagents.entity.TaPersonBuilding;
+import com.huiju.estateagents.service.ITaPersonBuildingService;
+import org.springframework.beans.factory.annotation.Autowired;
 
 import javax.servlet.http.HttpServletRequest;
+import java.util.ArrayList;
+import java.util.List;
 import java.util.Map;
 
 /**
@@ -10,7 +18,12 @@ import java.util.Map;
  * @date 2018-12-18
  */
 public class BaseController {
-	
+	@Autowired
+	private ITaUserService taUserService;
+
+	@Autowired
+	private ITaPersonBuildingService taPersonBuildingService;
+
 	/**
 	 * 获取orgId
 	 * @param request
@@ -59,4 +72,15 @@ public class BaseController {
 		
 		return null;
 	}
+
+	public List<TaPersonBuilding> getTaPersonBuildingListByUserId(HttpServletRequest request) {
+		TaUser taUser = taUserService.getById(getUserId(request));
+		QueryWrapper<TaPersonBuilding> taPersonBuildingQueryWrapper = new QueryWrapper<>();
+		taPersonBuildingQueryWrapper.eq("user_id",taUser.getUserId());
+		List<TaPersonBuilding> taPersonBuildingList = taPersonBuildingService.list(taPersonBuildingQueryWrapper);
+		if (null != taUser.getIsAdmin() && taUser.getIsAdmin()){
+			taPersonBuildingList = new ArrayList<>();
+		}
+		return taPersonBuildingList;
+	}
 }

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

@@ -367,19 +367,18 @@ public class TaUserController extends BaseController {
         try {
             //使用分页插件
             IPage pg = new Page<>(pageNum, pageSize);
-            QueryWrapper<TaUser> taUserQueryWrapper = new QueryWrapper<>();
-            taUserQueryWrapper.eq("org_id",getOrgId(request));
-            taUserQueryWrapper.like(!StringUtils.isEmpty(userName),"user_name",userName);
-            taUserQueryWrapper.like(!StringUtils.isEmpty(phone),"phone",phone);
-            taUserQueryWrapper.eq(null != status,"status",status);
-//            taUserQueryWrapper.ne("status", 9);
+            TaUser taUser = new TaUser();
+            taUser.setOrgId(getOrgId(request));
+            taUser.setUserName(userName);
+            taUser.setPhone(phone);
+            taUser.setStatus(status);
             if(null != isConsultant && isConsultant == 1){
-                taUserQueryWrapper.eq("is_consultant",true);
+                taUser.setIsConsultant(true);
             }else if (null != isConsultant && isConsultant == 0){
-                taUserQueryWrapper.eq("is_consultant",false);
+                taUser.setIsConsultant(false);
             }
-//            taUserQueryWrapper.ne("IFNULL(is_admin,0)",CommConstant.STATUS_NORMAL);
-            IPage<TaUser> result = iTaUserService.page(pg,taUserQueryWrapper);
+
+            IPage<TaUser> result = iTaUserService.seleUserList(pg,taUser,getTaPersonBuildingListByUserId(request));
             List<TaUser> taUserList = result.getRecords();
             taUserList.forEach(e -> {
                 List<TaTags> taTagsList = iTaUserService.getTagsList(e);

src/main/java/com/huiju/estateagents/center/taUser/mapper/TaUserMapper.java

@@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.huiju.estateagents.center.taUser.entity.TaTags;
 import com.huiju.estateagents.center.taUser.entity.TaUser;
+import com.huiju.estateagents.entity.TaPersonBuilding;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 
@@ -26,4 +27,6 @@ public interface TaUserMapper extends BaseMapper<TaUser> {
 	List<TaTags> getTagsList(@Param("userId") Integer userId,@Param("orgId") Integer orgId);
 	
 	List<TaUser> getUserList(@Param("phone") String phone,@Param("loginName") String loginName,@Param("orgId") Integer orgId);
+
+    IPage<TaUser> seleUserList(IPage pg,@Param("taUser") TaUser taUser,@Param("personBuildingList") List<TaPersonBuilding> personBuildingList);
 }

src/main/java/com/huiju/estateagents/center/taUser/service/ITaUserService.java

@@ -5,6 +5,7 @@ import com.baomidou.mybatisplus.extension.service.IService;
 import com.huiju.estateagents.base.ResponseBean;
 import com.huiju.estateagents.center.taUser.entity.TaTags;
 import com.huiju.estateagents.center.taUser.entity.TaUser;
+import com.huiju.estateagents.entity.TaPersonBuilding;
 
 import java.util.List;
 import java.util.Map;
@@ -51,4 +52,13 @@ public interface ITaUserService extends IService<TaUser> {
      * @return
      */
     ResponseBean departureUser(Integer userId, List<String> customerIdList, Integer consultantUserId);
+
+    /**
+     * 分页查询用户列表
+     * @param pg
+     * @param taUser
+     * @param taPersonBuildingListByUserId
+     * @return
+     */
+    IPage<TaUser> seleUserList(IPage pg, TaUser taUser, List<TaPersonBuilding> taPersonBuildingListByUserId);
 }

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

@@ -539,6 +539,19 @@ public class TaUserServiceImpl extends ServiceImpl<TaUserMapper, TaUser> impleme
 		return ResponseBean.success("操作成功!");
 	}
 
+	/**
+	 * 分页查询用户列表
+	 *
+	 * @param pg
+	 * @param taUser
+	 * @param personBuildingList
+	 * @return
+	 */
+	@Override
+	public IPage<TaUser> seleUserList(IPage pg, TaUser taUser, List<TaPersonBuilding> personBuildingList) {
+		return taUserMapper.seleUserList(pg,taUser,personBuildingList);
+	}
+
 	private boolean updateUserStatus(TaUser user) {
 		UpdateWrapper<TaUser> updateWrapper = new UpdateWrapper<>();
 		updateWrapper.eq("user_id", user.getUserId());

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),getUserId(request));
+        return taBuildingService.buildingListSelect(pageNum,pageSize,name,code,startDate,buildingStatus,marketStatus,cityId,isMain,getOrgId(request),getTaPersonBuildingListByUserId(request));
     }
 
     /**

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

@@ -3,6 +3,7 @@ package com.huiju.estateagents.service;
 import com.huiju.estateagents.base.ResponseBean;
 import com.huiju.estateagents.entity.TaBuilding;
 import com.baomidou.mybatisplus.extension.service.IService;
+import com.huiju.estateagents.entity.TaPersonBuilding;
 
 import java.time.LocalDateTime;
 import java.util.List;
@@ -31,7 +32,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,Integer userId);
+    ResponseBean buildingListSelect(Integer pageNum, Integer pageSize, String name, String code, LocalDateTime startDate, String buildingStatus, String marketStatus, Integer cityId, Integer isMain,Integer orgId,List<TaPersonBuilding> taPersonBuildingList);
 
     /**
      * 楼盘详情

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

@@ -90,12 +90,6 @@ 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<>();
@@ -131,20 +125,12 @@ 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,Integer userId) {
+    public ResponseBean buildingListSelect(Integer pageNum, Integer pageSize, String name, String code, LocalDateTime startDate, String buildingStatus, String marketStatus, Integer cityId, Integer isMain,Integer orgId,List<TaPersonBuilding> taPersonBuildingList) {
         Page<TaBuilding> page = new Page<>();
         page.setSize(pageSize == null ? 10 : pageSize);
         page.setCurrent(pageNum == null ? 1 : pageNum);
-        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/TaUserMapper.xml

@@ -50,4 +50,33 @@
         and (phone = #{phone}
         OR login_Name = #{loginName})
     </select>
+    <select id="seleUserList" resultType="com.huiju.estateagents.center.taUser.entity.TaUser">
+        SELECT
+            t.*,
+            b.building_id
+        FROM
+            ta_user t
+            LEFT JOIN ta_person_building b ON t.user_id = b.user_id
+        WHERE
+            t.org_id = #{taUser.orgId}
+            <if test="taUser.userName != null and taUser.userName != ''">
+                and t.user_name like CONCAT('%', #{taUser.userName}, '%')
+            </if>
+            <if test="taUser.phone != null and taUser.phone != ''">
+                and t.phone like CONCAT('%', #{taUser.phone}, '%')
+            </if>
+            <if test="taUser.status != null and taUser.status != ''">
+                and t.status = #{taUser.status}
+            </if>
+            <if test="taUser.isConsultant != null and taUser.isConsultant != '' or taUser.isConsultant ==0">
+                and t.is_consultant = #{taUser.isConsultant}
+            </if>
+            <if test="personBuildingList != null and personBuildingList.size > 0">
+                AND b.building_id in
+                <foreach collection="personBuildingList" item="personBuilding" open="(" close=")" separator=",">
+                    #{personBuilding.buildingId}
+                </foreach>
+            </if>
+            GROUP BY user_id
+    </select>
 </mapper>