|
@@ -7,6 +7,7 @@ import com.google.common.collect.Lists;
|
|
|
|
|
|
import com.gree.mall.miniapp.bean.es.CommonListES;
|
|
|
import com.gree.mall.miniapp.bean.user.CurrentCompanyWechat;
|
|
|
+import com.gree.mall.miniapp.exception.RemoteServiceException;
|
|
|
import com.gree.mall.miniapp.logic.es.EsLogic;
|
|
|
import com.gree.mall.miniapp.plus.entity.WorkerComList;
|
|
|
import com.gree.mall.miniapp.plus.entity.WorkerComListWebsit;
|
|
@@ -15,6 +16,7 @@ import com.gree.mall.miniapp.plus.service.AdminWebsitService;
|
|
|
import com.gree.mall.miniapp.plus.service.WorkerComListService;
|
|
|
import com.gree.mall.miniapp.plus.service.WorkerComListWebsitService;
|
|
|
import com.gree.mall.miniapp.plus.service.WorkerComListWorkerService;
|
|
|
+import com.gree.mall.miniapp.utils.StringUtil;
|
|
|
import com.gree.mall.miniapp.utils.oss.OSSUtil;
|
|
|
import lombok.extern.slf4j.Slf4j;
|
|
|
import org.apache.commons.lang3.StringUtils;
|
|
@@ -67,6 +69,8 @@ public class WorkerComListLogic {
|
|
|
return new Page<>(pageNum, pageSize);
|
|
|
}
|
|
|
comListIds = worker.stream().map(WorkerComListWorker::getWorkerComListId).distinct().collect(Collectors.toList());
|
|
|
+ }else {
|
|
|
+ throw new RemoteServiceException("师傅编号未传");
|
|
|
}
|
|
|
IPage<WorkerComList> page = workerComListService.lambdaQuery()
|
|
|
.like(StringUtils.isNotEmpty(title), WorkerComList::getTitle, title)
|
|
@@ -87,6 +91,8 @@ public class WorkerComListLogic {
|
|
|
* @param workerNumber
|
|
|
*/
|
|
|
public List<CommonListES> record(String comListId, String workerNumber) {
|
|
|
+ if (StringUtil.isEmpty(workerNumber))
|
|
|
+ throw new RemoteServiceException("师傅编号未传");
|
|
|
List<CommonListES> list = esLogic.list(Arrays.asList(workerNumber), workerNumber, comListId);
|
|
|
return list;
|
|
|
}
|