feat(service): 增加设备活动关联查询条件

src/main/java/com/xynet/marketing/service/impl/MercProjectDeviceServiceImpl.java

@@ -28,7 +28,10 @@ import java.util.Map;
 public class MercProjectDeviceServiceImpl extends ServiceImpl<MercProjectDeviceMapper, MercProjectDevice> implements MercProjectDeviceService {
     private LambdaQueryWrapper<MercProjectDevice> commonQueryWrapper(JMap<String, Object> param) {
         LambdaQueryWrapper<MercProjectDevice> lqw = new LambdaQueryWrapper<MercProjectDevice>()
-                .eq(Emptys.check(param.getInt("id")), MercProjectDevice::getId, param.getInt("id"));
+                .eq(Emptys.check(param.getInt("id")), MercProjectDevice::getId, param.getInt("id"))
+                .eq(Emptys.check(param.getInt("actId")), MercProjectDevice::getActId, param.getInt("actId"))
+                .eq(Emptys.check(param.getString("actType")), MercProjectDevice::getActType, param.getString("actType"))
+                .eq(Emptys.check(param.getString("deviceId")), MercProjectDevice::getDeviceId, param.getString("deviceId"));
         return lqw;
     }