Compare commits

..

No commits in common. "52896ebdd618ccccf5caf5d58a276d1461b9d1f8" and "ab9935ab8a5e2ff4bcaf9be4c2a27ab75d8f99fa" have entirely different histories.

3 changed files with 3 additions and 8 deletions

View File

@ -6,7 +6,6 @@ import cn.hutool.core.util.StrUtil;
import com.baomidou.mybatisplus.core.toolkit.Wrappers; import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.baomidou.mybatisplus.extension.service.IService; import com.baomidou.mybatisplus.extension.service.IService;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.google.common.base.Strings;
import com.njzscloud.common.core.ex.Exceptions; import com.njzscloud.common.core.ex.Exceptions;
import com.njzscloud.common.mp.support.PageParam; import com.njzscloud.common.mp.support.PageParam;
import com.njzscloud.common.mp.support.PageResult; import com.njzscloud.common.mp.support.PageResult;
@ -109,12 +108,8 @@ public class BizCompanyService extends ServiceImpl<BizCompanyMapper, BizCompanyE
UserDetail userDetail = SecurityUtil.loginUser(); UserDetail userDetail = SecurityUtil.loginUser();
Long userId = userDetail.getUserId(); Long userId = userDetail.getUserId();
String bizObjValue = userDetail.getBizObj(); String bizObjValue = userDetail.getBizObj();
BizCompanyEntity bizCompanyEntity;
if (Strings.isNullOrEmpty(bizObjValue)) {
bizCompanyEntity = this.getById(id);
return BeanUtil.copyProperties(bizCompanyEntity, SearchCompanyResult.class);
}
BizObj bizObj = BizObj.valueOf(bizObjValue); BizObj bizObj = BizObj.valueOf(bizObjValue);
BizCompanyEntity bizCompanyEntity;
switch (bizObj) { switch (bizObj) {
case ShiGongDanWei: case ShiGongDanWei:
case QingYunGongSi: case QingYunGongSi:

View File

@ -12,7 +12,7 @@ import org.springframework.web.bind.annotation.*;
import java.util.List; import java.util.List;
/** /**
* *
*/ */
@Slf4j @Slf4j
@RestController @RestController

View File

@ -12,7 +12,7 @@ import org.springframework.web.bind.annotation.*;
import java.util.List; import java.util.List;
/** /**
* *
*/ */
@Slf4j @Slf4j
@RestController @RestController