成员管理列表添加 关联项目数和关联电梯数

lift-system-service/src/main/java/cn/com/ty/lift/system/user/dao/entity/model/ProjectUserRequest.java

@@ -0,0 +1,30 @@
+package cn.com.ty.lift.system.user.dao.entity.model;
+
+import lombok.Data;
+
+import java.util.List;
+
+/**
+ * @author huangyuan
+ * @date 2020/6/30
+ * @description
+ */
+@Data
+public class ProjectUserRequest {
+    /**
+     * 用户id
+     */
+    private Long companyId;
+    /**
+     * 用户id集合
+     */
+    private List<Long> userIdList;
+
+    public ProjectUserRequest() {
+    }
+
+    public ProjectUserRequest(Long companyId, List<Long> userIdList) {
+        this.companyId = companyId;
+        this.userIdList = userIdList;
+    }
+}

lift-system-service/src/main/java/cn/com/ty/lift/system/user/dao/mapper/UserAccountMapper.java

@@ -72,18 +72,18 @@ public interface UserAccountMapper extends BaseMapper<UserAccount> {
     Long deleteProjectUser(PropertyUserRequest propertyUserRequest);
 
     /**
-     * @param userIdList 用户id集合
+     * @param projectUserRequest 用户id集合
      * @return 用户项目信息
      * @description 获取用户关联的项目信息
      * @date 2020/5/2 10:54 下午
      */
-    List<ProjectUser> getProjectUserList(List<Long> userIdList);
+    List<ProjectUser> getProjectUserList(ProjectUserRequest projectUserRequest);
 
     /**
-     * @param userIdList 用户id集合
+     * @param projectUserRequest 用户id集合
      * @return 用户项目信息
      * @description 获取用户关联的电梯信息
      * @date 2020/5/2 10:54 下午
      */
-    List<LiftUser> getLiftUserList(List<Long> userIdList);
+    List<LiftUser> getLiftUserList(ProjectUserRequest projectUserRequest);
 }

lift-system-service/src/main/java/cn/com/ty/lift/system/user/service/IProjectService.java

@@ -101,18 +101,18 @@ public interface IProjectService {
     ProjectInfo getProjectById(Long projectId);
 
     /**
-     * @param userIdList 用户id集合
+     * @param projectUserRequest 用户id集合
      * @return 用户项目信息
      * @description 获取用户关联的项目信息
      * @date 2020/5/2 10:54 下午
      */
-    List<ProjectUser> getProjectUserList(List<Long> userIdList);
+    List<ProjectUser> getProjectUserList(ProjectUserRequest projectUserRequest);
 
     /**
-     * @param userIdList 用户id集合
+     * @param projectUserRequest 用户id集合
      * @return 用户项目信息
      * @description 获取用户关联的电梯信息
      * @date 2020/5/2 10:54 下午
      */
-    List<LiftUser> getLiftUserList(List<Long> userIdList);
+    List<LiftUser> getLiftUserList(ProjectUserRequest projectUserRequest);
 }

lift-system-service/src/main/java/cn/com/ty/lift/system/user/service/impl/MtCompanyUserService.java

@@ -249,13 +249,15 @@ public class MtCompanyUserService extends ServiceImpl<MtCompanyUserMapper, MtCom
             Map<Long, LiftCertificate> userIdToLiftCertificate = ProjectUtils.attrToObjMap(liftCertificateList, "userId", null);
 
             //关联项目信息
-            List<ProjectUser> projectUserList = projectService.getProjectUserList(userIdList);
+            List<ProjectUser> projectUserList = projectService.getProjectUserList(new ProjectUserRequest(
+                    mtCompanyUserRequest.getCompanyId(), userIdList));
             Map<Long, List<ProjectUser>> userIdToProjectUserList = new HashMap<>();
             if (projectUserList != null && projectUserList.size() > 0) {
                 userIdToProjectUserList = projectUserList.stream().collect(Collectors.groupingBy(ProjectUser::getUserId));
             }
             //关联电梯信息
-            List<LiftUser> liftUserList = projectService.getLiftUserList(userIdList);
+            List<LiftUser> liftUserList = projectService.getLiftUserList(new ProjectUserRequest(
+                    mtCompanyUserRequest.getCompanyId(), userIdList));
             Map<Long, List<LiftUser>> userIdToLiftUserList = new HashMap<>();
             if (liftUserList != null && liftUserList.size() > 0) {
                 userIdToLiftUserList = liftUserList.stream().collect(Collectors.groupingBy(LiftUser::getLiftId));

lift-system-service/src/main/java/cn/com/ty/lift/system/user/service/impl/ProjectService.java

@@ -132,13 +132,13 @@ public class ProjectService implements IProjectService {
     }
 
     @Override
-    public List<ProjectUser> getProjectUserList(List<Long> userIdList) {
-        return userAccountMapper.getProjectUserList(userIdList);
+    public List<ProjectUser> getProjectUserList(ProjectUserRequest projectUserRequest) {
+        return userAccountMapper.getProjectUserList(projectUserRequest);
     }
 
     @Override
-    public List<LiftUser> getLiftUserList(List<Long> userIdList) {
-        return userAccountMapper.getLiftUserList(userIdList);
+    public List<LiftUser> getLiftUserList(ProjectUserRequest projectUserRequest) {
+        return userAccountMapper.getLiftUserList(projectUserRequest);
     }
 
 }

lift-system-service/src/main/resources/mapper/UserAccountMapper.xml

@@ -136,12 +136,12 @@
     </delete>
 
     <!-- 获取用户关联的项目信息 -->
-    <select id="getProjectUserList" parameterType="java.util.List"
+    <select id="getProjectUserList" parameterType="cn.com.ty.lift.system.user.dao.entity.model.ProjectUserRequest"
             resultType="cn.com.ty.lift.system.user.dao.entity.model.ProjectUser">
         select pu.project_id as projectId,
                pu.user_id as userId
         from project_user pu
-        where true
+        where pu.mt_company_id = #{companyId}
         <if test="userIdList != null">
             and pu.user_id in
             <foreach item="item" index="index" collection="userIdList" open="(" separator="," close=")">
@@ -151,12 +151,13 @@
     </select>
 
     <!-- 获取用户关联电梯信息 -->
-    <select id="getLiftUserList" parameterType="java.util.List"
+    <select id="getLiftUserList" parameterType="cn.com.ty.lift.system.user.dao.entity.model.ProjectUserRequest"
             resultType="cn.com.ty.lift.system.user.dao.entity.model.LiftUser">
         select plr.lift_id as liftId,
         plr.worker_id as userId
         from project_lift_relevance plr
-        where true
+        where
+        plr.mt_company_id = #{companyId}
         <if test="userIdList != null">
             and plr.worker_id in
             <foreach item="item" index="index" collection="userIdList" open="(" separator="," close=")">