diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/invest/InvestBaseController.java b/mallinkAdmin/src/main/java/com/iformall/controller/invest/InvestBaseController.java index c9cf2a5bc..1280018ef 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/invest/InvestBaseController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/invest/InvestBaseController.java @@ -24,7 +24,7 @@ public class InvestBaseController extends BaseController { return new InvestResultData(e.getErrorCode(), e.getMessage()); } catch (Exception e) { log.error("execute error", e); - return new InvestResultData(ErrorCode.SYS_PARAMETER_NOT_NULL); + return new InvestResultData(ErrorCode.SYS_PARAMETER_ERROR.getCode(),e.getMessage()); } finally { InvestUserContext.remove(); } diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/invest/InvestDemandController.java b/mallinkAdmin/src/main/java/com/iformall/controller/invest/InvestDemandController.java index 6b9f26e15..ff3ed50fb 100755 --- a/mallinkAdmin/src/main/java/com/iformall/controller/invest/InvestDemandController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/invest/InvestDemandController.java @@ -43,7 +43,7 @@ public class InvestDemandController extends InvestBaseController { @SystemServiceLog @ApiOperation(value = "分页列表接口") @GetMapping("/list") - public InvestResultData> list(InvestPageQuery params) { + public InvestResultData> list(@RequestBody InvestPageQuery params) { return execute(params, p -> investBizService.queryPageDemand(p)); } diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/invest/InvestTaskController.java b/mallinkAdmin/src/main/java/com/iformall/controller/invest/InvestTaskController.java index 8eeb765a4..ac6266e2d 100755 --- a/mallinkAdmin/src/main/java/com/iformall/controller/invest/InvestTaskController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/invest/InvestTaskController.java @@ -41,7 +41,7 @@ public class InvestTaskController extends InvestBaseController { @SystemServiceLog @ApiOperation("分页列表接口") @GetMapping("/list") - public InvestResultData> list(InvestPageQuery params) { + public InvestResultData> list(@RequestBody InvestPageQuery params) { return execute(params, p -> bizService.queryPageTask(p)); } diff --git a/mallinkService/src/main/java/com/iformall/service/invest/impl/InvestBizServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/invest/impl/InvestBizServiceImpl.java index 3ba8784b0..fb07f7d49 100644 --- a/mallinkService/src/main/java/com/iformall/service/invest/impl/InvestBizServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/invest/impl/InvestBizServiceImpl.java @@ -1,6 +1,7 @@ package com.iformall.service.invest.impl; import com.alibaba.fastjson.JSON; +import com.alibaba.fastjson.JSONArray; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.iformall.domain.dto.InvestDemandDto; @@ -123,7 +124,7 @@ public class InvestBizServiceImpl implements InvestBizService { List ownerInfo = null ; Map contentMap = JSON.parseObject(item.getContent(),Map.class); if (MapUtils.isNotEmpty(contentMap)) { - String followMember = (String) contentMap.get(InvestFollowRecordEntity.KEY_MEMBER); + Object followMember = contentMap.get(InvestFollowRecordEntity.KEY_MEMBER); ownerInfo = getMallUserInfos(followMember, usersMap); } return ownerInfo; @@ -230,11 +231,16 @@ public class InvestBizServiceImpl implements InvestBizService { return resultItemVo; } - private List getMallUserInfos(String userJson, Map usersMap) { + private List getMallUserInfos(Object userJson, Map usersMap) { List ownerInfo = Lists.newArrayList(); - List ownerList = JSON.parseArray(userJson, Long.class); + JSONArray ownerList; + if(userJson instanceof String) { + ownerList = JSONArray.parseArray((String)userJson); + } else { + ownerList = (JSONArray) userJson; + } if (CollectionUtils.isNotEmpty(ownerList)) { - for (Long userId : ownerList) { + for (Object userId : ownerList) { ownerInfo.add(usersMap.get(userId)); } }