zoujiajian 2 years ago
parent
commit
922756b15f

+ 2 - 2
netflix-service/src/main/java/com/cyksj/service/distribute/impl/DistributeServiceImpl.java

@@ -527,9 +527,9 @@ public class DistributeServiceImpl implements DistributeService {
 			return;
 		}
 		if (userDistributeEquipmentMapper.selectCount(Wrappers.lambdaQuery(UserDistributeEquipment.class)
-				.eq(UserDistributeEquipment::getUserId, userId)) > 0) {
+				.eq(UserDistributeEquipment::getDistributeId, distributeId)) > 0) {
 			userDistributeEquipmentMapper.delete(Wrappers.lambdaQuery(UserDistributeEquipment.class)
-					.eq(UserDistributeEquipment::getUserId, userId));
+					.eq(UserDistributeEquipment::getDistributeId, distributeId));
 		}
 	}
 }

+ 3 - 1
netflix-web/src/main/java/com/cyksj/web/controller/manage/distribute/DistributeController.java

@@ -159,6 +159,8 @@ public class DistributeController {
 			throw BusinessRuntimeException.getInstance("id不存在");
 		}
 		userDistributeMapper.deleteById(id);
+		userDistributeEquipmentMapper.delete(Wrappers.lambdaQuery(UserDistributeEquipment.class)
+				.eq(UserDistributeEquipment::getDistributeId, id));
 		return GatewayResponse.SUCCESS.newBuilder().toResult("删除成功");
 	}
 
@@ -263,7 +265,7 @@ public class DistributeController {
 		}
 		if (isSpecialEp != null) {
 			//是否是特殊设备分销渠道商
-			String condition = String.format(" and %s (select 1 from user_distribute_equipment up where up.user_id = ud.user_id limit 1)", isSpecialEp ? "exists" : "not exists");
+			String condition = String.format(" and %s (select 1 from user_distribute_equipment up where up.distribute_id = ud.id limit 1)", isSpecialEp ? "exists" : "not exists");
 			builder.put("condition", condition);
 		}
 		Map<Long, String> businessNameMap = new ConcurrentHashMap<>();