Преглед на файлове

项目组成员移除增加关联电梯判断

别傲 преди 5 години
родител
ревизия
139dfb8d37

+ 1 - 1
lift-business-service/src/main/java/cn/com/ty/lift/business/project/service/ProjectLiftRelevanceService.java

@@ -339,7 +339,7 @@ public class ProjectLiftRelevanceService extends ServiceImpl<ProjectLiftRelevanc
      * @description 根据项目id和公司id,维保工列表查询关联电梯列表
      * @date 2020/6/15 11:19 上午
      */
-    public List<ProjectLiftRelevance> queryLiftRelevanceByProjectId(Long projectId, Long mtCompanyId, List<ProjectUser> userList) {
+    public List<ProjectLiftRelevance> queryLiftRelevanceByProjectId(Long projectId, Long mtCompanyId, List<Long> userList) {
         QueryWrapper<ProjectLiftRelevance> queryWrapper = new QueryWrapper<>();
         LambdaQueryWrapper<ProjectLiftRelevance> lambda = queryWrapper.lambda();
         lambda.eq(ProjectLiftRelevance::getMtCompanyId, mtCompanyId);

+ 2 - 1
lift-business-service/src/main/java/cn/com/ty/lift/business/project/service/ProjectUserService.java

@@ -152,7 +152,8 @@ public class ProjectUserService extends ServiceImpl<ProjectUserMapper, ProjectUs
         List<ProjectUser> userList = request.getUserList();
         Long projectId = request.getProjectId();
         Long mtCompanyId = request.getMtCompanyId();
-        List<ProjectLiftRelevance> list = projectLiftRelevanceService.queryLiftRelevanceByProjectId(projectId, mtCompanyId, userList);
+        List<Long> userIdList = userList.stream().map(ProjectUser::getUserId).collect(Collectors.toList());
+        List<ProjectLiftRelevance> list = projectLiftRelevanceService.queryLiftRelevanceByProjectId(projectId, mtCompanyId, userIdList);
         if (CollUtil.isNotEmpty(list)) {
             for (ProjectUser user : userList) {
                 for (ProjectLiftRelevance relevance : list) {