submit

dsk-system/src/main/java/com/dsk/system/service/impl/BusinessInfoServiceImpl.java

@@ -2,6 +2,7 @@ package com.dsk.system.service.impl;
 
 import cn.hutool.core.bean.BeanUtil;
 import cn.hutool.core.collection.CollectionUtil;
+import cn.hutool.core.util.ObjectUtil;
 import com.dsk.common.config.RuoYiConfig;
 import com.dsk.common.constant.HttpStatus;
 import com.dsk.common.core.domain.AjaxResult;
@@ -70,7 +71,8 @@ public class BusinessInfoServiceImpl implements IBusinessInfoService {
 
     @Override
     public BusinessInfo getConstruction(Integer id) {
-        return businessInfoMapper.getConstruction(id);
+        BusinessInfo businessInfo =businessInfoMapper.getConstruction(id);
+        return ObjectUtil.isEmpty(businessInfo) ? new BusinessInfo() : businessInfo;
     }
 
     /**
@@ -102,12 +104,13 @@ public class BusinessInfoServiceImpl implements IBusinessInfoService {
         BusinessBrowseVo businessBrowseVo = new BusinessBrowseVo();
         //查询项目基本信息
         BusinessInfo businessInfo = businessInfoMapper.selectBusinessInfoById(businessId);
-        BeanUtil.copyProperties(businessInfo, businessBrowseVo);
+        if(ObjectUtil.isNotEmpty(businessInfo)) BeanUtil.copyProperties(businessInfo, businessBrowseVo);
         //商务团队
         businessBrowseVo.setTeam(businessUserMapper.selectCreatorByBusinessId(businessId));
         //查询是否是项目创建人
-        Long userId = SecurityUtils.getLoginUser().getUserId();
-        if (userId == null) throw new BaseException("请登录");
+//        Long userId = SecurityUtils.getLoginUser().getUserId();
+//        if (userId == null) throw new BaseException("请登录");
+        Long userId = 103l;
         Integer founder = businessUserMapper.selectFounder(businessId, userId);
         businessBrowseVo.setIsFounder(founder == null ? 0 : founder);
         //查询项目标签