取消关联

lift-business-service/src/main/java/cn/com/ty/lift/business/capital/dao/mapper/CommonMapper.java

@@ -2,6 +2,7 @@ package cn.com.ty.lift.business.capital.dao.mapper;
 
 
 import org.apache.ibatis.annotations.Select;
+import org.apache.ibatis.annotations.SelectProvider;
 
 /**
  * @author bieao
@@ -12,4 +13,7 @@ public interface CommonMapper {
 
     @Select("select name from user_info where user_id = #{userId}")
     String queryUserNameById(Long userId);
+
+    @Select("select count(1) from project_lift_relevance where worker_id = #{workerId} and project_id = #{projectId}")
+    long getRelevanceLiftNum(Long workerId, Long projectId);
 }

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

@@ -370,8 +370,8 @@ public class ProjectLiftRelevanceService extends ServiceImpl<ProjectLiftRelevanc
      * @date 2020/5/26 4:40 下午
      */
     public RestResponse cancelRelevance(ProjectRequest request) {
-        IPage<ProjectRelevanceResponse> page = relevanceList(request);
-        if (page != null && page.getRecords() != null && page.getRecords().size() > 0) {
+        long relevanceLiftNum = commonMapper.getRelevanceLiftNum(request.getWorkerId(), request.getProjectId());
+        if (relevanceLiftNum > 0) {
             return RestResponse.fail("用户存在关联电梯，无法取消");
         }
         boolean removeFlag = projectUserService.remove(new QueryWrapper<ProjectUser>()