|
@@ -14,6 +14,7 @@ import com.cdf.service.IUserService;
|
|
import com.cdf.util.Base64Converter;
|
|
import com.cdf.util.Base64Converter;
|
|
import com.cdf.util.JwtUtil;
|
|
import com.cdf.util.JwtUtil;
|
|
import lombok.extern.slf4j.Slf4j;
|
|
import lombok.extern.slf4j.Slf4j;
|
|
|
|
+import org.apache.commons.lang3.StringUtils;
|
|
import org.springframework.beans.factory.annotation.Autowired;
|
|
import org.springframework.beans.factory.annotation.Autowired;
|
|
import org.springframework.stereotype.Service;
|
|
import org.springframework.stereotype.Service;
|
|
|
|
|
|
@@ -57,7 +58,12 @@ public class FdkkSceneService {
|
|
|
|
|
|
|
|
|
|
public PageInfo list(FdkkSceneListRequest param, String token){
|
|
public PageInfo list(FdkkSceneListRequest param, String token){
|
|
- FdkkResponse fdkkResponse = fdkkClient.sceneList(param, getFdkkToken(token));
|
|
|
|
|
|
+ FdkkResponse fdkkResponse;
|
|
|
|
+ if(StringUtils.isBlank(param.getSearchKey())){
|
|
|
|
+ fdkkResponse = fdkkClient.sceneList(param, getFdkkToken(token));
|
|
|
|
+ }else {
|
|
|
|
+ fdkkResponse = fdkkClient.getOnlySceneList(param, getFdkkToken(token));
|
|
|
|
+ }
|
|
if(fdkkResponse.getCode() != ResultCode.SUCCESS.code){
|
|
if(fdkkResponse.getCode() != ResultCode.SUCCESS.code){
|
|
throw new BusinessException(fdkkResponse.getCode(),fdkkResponse.getMsg());
|
|
throw new BusinessException(fdkkResponse.getCode(),fdkkResponse.getMsg());
|
|
}
|
|
}
|