|
|
@@ -26,7 +26,6 @@ import io.renren.modules.componet.utils.ResponseResult;
|
|
|
import io.renren.modules.oss.cloud.OSSFactory;
|
|
|
import io.renren.modules.qmgj.entity.*;
|
|
|
import io.renren.modules.qmgj.service.*;
|
|
|
-import io.renren.modules.qmgj.util.DateUtil;
|
|
|
import io.renren.modules.qmgj.wxpayutil.OurWxPayConfig;
|
|
|
import io.renren.modules.qmgj.wxpayutil.PayCommonUtil;
|
|
|
import io.renren.modules.qmgj.wxpayutil.StringUtil;
|
|
|
@@ -34,12 +33,12 @@ import io.renren.modules.qmjz.entity.WxConsumeInfoEntity;
|
|
|
import io.renren.modules.qmjz.service.RegionService;
|
|
|
import io.renren.modules.qmjz.service.WxConsumeInfoService;
|
|
|
import io.renren.modules.qmjz.utils.RestUtil;
|
|
|
+import io.renren.modules.qyh.service.OrderService;
|
|
|
+import io.renren.modules.qyh.service.PointsRecordService;
|
|
|
import io.renren.modules.qyh.service.ServiceCityService;
|
|
|
import io.renren.modules.sys.entity.BizLibraryEntity;
|
|
|
import io.renren.modules.sys.entity.SysUserEntity;
|
|
|
import io.renren.modules.sys.service.BizLibraryService;
|
|
|
-import io.renren.modules.qyh.service.OrderService;
|
|
|
-import io.renren.modules.qyh.service.PointsRecordService;
|
|
|
import lombok.extern.slf4j.Slf4j;
|
|
|
import org.apache.commons.lang3.RandomStringUtils;
|
|
|
import org.apache.commons.lang3.StringUtils;
|
|
|
@@ -617,8 +616,10 @@ public class ApiController {
|
|
|
queryWrapper.eq(StrUtil.isNotBlank((String) params.get("category")), WorkEntity::getCategory,
|
|
|
(String) params.get("category"));
|
|
|
queryWrapper.like(StrUtil.isNotBlank(keyword), WorkEntity::getTitle, keyword);
|
|
|
- queryWrapper.eq(params.get("city") != null, WorkEntity::getCity,
|
|
|
- Long.parseLong(params.get("city").toString()));
|
|
|
+ if (ObjectUtil.isNotEmpty(params.get("city"))) {
|
|
|
+ queryWrapper.eq(WorkEntity::getCity,
|
|
|
+ Long.parseLong(params.get("city").toString()));
|
|
|
+ }
|
|
|
|
|
|
Object typeObject = params.get("type");
|
|
|
if (ObjectUtil.isNotNull(typeObject)) {
|
