|
@@ -5,7 +5,7 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
|
|
|
import com.baomidou.mybatisplus.core.metadata.IPage;
|
|
import com.baomidou.mybatisplus.core.metadata.IPage;
|
|
|
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
|
|
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
|
|
|
import com.ydtech.core.page.HttpResult;
|
|
import com.ydtech.core.page.HttpResult;
|
|
|
-import com.ydtech.modules.admin.model.SysUser;
|
|
|
|
|
|
|
+import com.ydtech.exception.SystemException;
|
|
|
import com.ydtech.modules.admin.model.dto.SysUserDto;
|
|
import com.ydtech.modules.admin.model.dto.SysUserDto;
|
|
|
import com.ydtech.modules.admin.model.po.SysOrganizationQuotation;
|
|
import com.ydtech.modules.admin.model.po.SysOrganizationQuotation;
|
|
|
import com.ydtech.modules.admin.model.po.SysQuotationTheme;
|
|
import com.ydtech.modules.admin.model.po.SysQuotationTheme;
|
|
@@ -20,6 +20,7 @@ import com.ydtech.modules.protocol.utils.AssertionUtils;
|
|
|
import io.swagger.annotations.Api;
|
|
import io.swagger.annotations.Api;
|
|
|
import io.swagger.annotations.ApiOperation;
|
|
import io.swagger.annotations.ApiOperation;
|
|
|
import lombok.RequiredArgsConstructor;
|
|
import lombok.RequiredArgsConstructor;
|
|
|
|
|
+import org.apache.commons.lang3.StringUtils;
|
|
|
import org.springframework.beans.factory.annotation.Autowired;
|
|
import org.springframework.beans.factory.annotation.Autowired;
|
|
|
import org.springframework.web.bind.annotation.*;
|
|
import org.springframework.web.bind.annotation.*;
|
|
|
|
|
|
|
@@ -146,10 +147,12 @@ public class SysQuotationController extends BaseController {
|
|
|
|
|
|
|
|
@ApiOperation(value = "获取用户对应报价单")
|
|
@ApiOperation(value = "获取用户对应报价单")
|
|
|
@GetMapping(value = "/getThemeByUserId")
|
|
@GetMapping(value = "/getThemeByUserId")
|
|
|
- public HttpResult< List<String>> getThemeByUserId() {
|
|
|
|
|
- SysUser user = getUser();
|
|
|
|
|
|
|
+ public HttpResult< List<String>> getThemeByUserId(String userId) {
|
|
|
|
|
+ if(StringUtils.isBlank(userId)){
|
|
|
|
|
+ throw new SystemException("userId不能为空");
|
|
|
|
|
+ }
|
|
|
LambdaQueryWrapper<SysOrganizationQuotation> oQueryWrapper = new LambdaQueryWrapper<>();
|
|
LambdaQueryWrapper<SysOrganizationQuotation> oQueryWrapper = new LambdaQueryWrapper<>();
|
|
|
- oQueryWrapper.eq(SysOrganizationQuotation::getAuthorizationId, user.getId());
|
|
|
|
|
|
|
+ oQueryWrapper.eq(SysOrganizationQuotation::getAuthorizationId, userId);
|
|
|
List<SysOrganizationQuotation> list = sysOrganizationQuotationService.list(oQueryWrapper);
|
|
List<SysOrganizationQuotation> list = sysOrganizationQuotationService.list(oQueryWrapper);
|
|
|
List<String> themeCodes = new ArrayList<>();
|
|
List<String> themeCodes = new ArrayList<>();
|
|
|
if (list == null || list.size() == 0) {
|
|
if (list == null || list.size() == 0) {
|