|
@@ -13,6 +13,7 @@ import com.gree.mall.miniapp.helper.ResponseHelper;
|
|
|
import com.gree.mall.miniapp.plus.entity.*;
|
|
|
import com.gree.mall.miniapp.plus.service.*;
|
|
|
import com.gree.mall.miniapp.utils.CommonUtils;
|
|
|
+import com.gree.mall.miniapp.utils.StringUtil;
|
|
|
import com.gree.mall.miniapp.utils.oss.OSSUtil;
|
|
|
import lombok.extern.slf4j.Slf4j;
|
|
|
import org.springframework.beans.BeanUtils;
|
|
@@ -114,8 +115,10 @@ public class CommonLogic {
|
|
|
currentCompanyWechat.setUser(user);
|
|
|
|
|
|
|
|
|
- AdminWebsit adminWebsit = adminWebsitService.getById(user.getWebsitId());
|
|
|
- currentCompanyWechat.setAdminWebsit(adminWebsit);
|
|
|
+ if (user == null || !StringUtil.isEmpty(user.getWebsitId())) {
|
|
|
+ AdminWebsit adminWebsit = adminWebsitService.getById(user.getWebsitId());
|
|
|
+ currentCompanyWechat.setAdminWebsit(adminWebsit);
|
|
|
+ }
|
|
|
return currentCompanyWechat;
|
|
|
|
|
|
}
|