|
|
@@ -20,6 +20,8 @@ import com.alibaba.fastjson.JSON;
|
|
|
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
|
|
|
import com.baomidou.mybatisplus.core.toolkit.CollectionUtils;
|
|
|
import com.baomidou.mybatisplus.core.toolkit.StringUtils;
|
|
|
+import org.springblade.client.entity.CorpsDesc;
|
|
|
+import org.springblade.client.entity.FeesDesc;
|
|
|
import org.springblade.core.secure.utils.AuthUtil;
|
|
|
import org.springblade.finance.excel.FeeStatisticsExcel;
|
|
|
import org.springblade.finance.vo.AccVO;
|
|
|
@@ -132,9 +134,19 @@ public class AccController extends BladeController {
|
|
|
//录入人
|
|
|
e.setCreateUserName(iUserClient.userInfoById(e.getCreateUser()).getData().getRealName());
|
|
|
//费用名称
|
|
|
- e.setItemName(iFeesDescClient.detail(Long.valueOf(e.getCostType())).getData().getCname());
|
|
|
+ if (StringUtils.isNotBlank(e.getCostType())){
|
|
|
+ R<FeesDesc> detail = iFeesDescClient.detail(Long.valueOf(e.getCostType()));
|
|
|
+ if (detail.isSuccess() && detail.getData() != null){
|
|
|
+ e.setItemName(detail.getData().getCname());
|
|
|
+ }
|
|
|
+ }
|
|
|
//客户名称
|
|
|
- e.setCorpName(corpsDescClient.getCorpMessage(e.getCorpId()).getData().getCname());
|
|
|
+ if (e.getCorpId() != null){
|
|
|
+ R<CorpsDesc> corpMessage = corpsDescClient.getCorpMessage(e.getCorpId());
|
|
|
+ if (corpMessage.isSuccess() && corpMessage.getData() != null){
|
|
|
+ e.setCorpName(corpMessage.getData().getCname());
|
|
|
+ }
|
|
|
+ }
|
|
|
});
|
|
|
return R.data(pages);
|
|
|
}
|
lazhaoqian