From 13e4e0e8802fd929dffed9301f107a8729a072e8 Mon Sep 17 00:00:00 2001 From: x_z Date: Wed, 15 Mar 2023 17:29:00 +0800 Subject: [PATCH] =?UTF-8?q?1.=E4=BF=AE=E5=A4=8D=E9=83=A8=E5=88=86=E5=B7=B2?= =?UTF-8?q?=E7=9F=A5=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../auth/InvWarehouseController.java | 3 +-- .../basic/BasicBussinessTypeController.java | 24 ++++++++++--------- .../mybatis/mapper/auth/InvWarehouseDao.xml | 1 + .../mapper/basic/BasicBussinessTypeDao.xml | 3 +++ 4 files changed, 18 insertions(+), 13 deletions(-) diff --git a/src/main/java/com/glxp/api/controller/auth/InvWarehouseController.java b/src/main/java/com/glxp/api/controller/auth/InvWarehouseController.java index 84c9b9e1..1b6e3423 100644 --- a/src/main/java/com/glxp/api/controller/auth/InvWarehouseController.java +++ b/src/main/java/com/glxp/api/controller/auth/InvWarehouseController.java @@ -12,7 +12,6 @@ import com.glxp.api.common.util.ResultVOUtils; import com.glxp.api.controller.BaseController; import com.glxp.api.entity.auth.*; import com.glxp.api.entity.basic.BasicBussinessTypeEntity; -import com.glxp.api.entity.system.SystemParamConfigEntity; import com.glxp.api.req.auth.*; import com.glxp.api.req.basic.FilterBussinessTypeRequest; import com.glxp.api.req.system.DeleteRequest; @@ -33,7 +32,6 @@ import org.springframework.web.bind.annotation.RestController; import javax.annotation.Resource; import javax.validation.Valid; import java.util.*; -import java.util.stream.Collectors; @RestController public class InvWarehouseController extends BaseController { @@ -130,6 +128,7 @@ public class InvWarehouseController extends BaseController { filterInvWarehouseRequest.setUserId(userId); } else { filterInvWarehouseRequest.setUserId(null); + filterInvWarehouseRequest.setSpUse(true); } List list = invWarehouseService.findInvListByUser(filterInvWarehouseRequest); diff --git a/src/main/java/com/glxp/api/controller/basic/BasicBussinessTypeController.java b/src/main/java/com/glxp/api/controller/basic/BasicBussinessTypeController.java index 5e1df8f0..1918f351 100644 --- a/src/main/java/com/glxp/api/controller/basic/BasicBussinessTypeController.java +++ b/src/main/java/com/glxp/api/controller/basic/BasicBussinessTypeController.java @@ -25,8 +25,6 @@ import com.glxp.api.util.CustomUtil; import com.glxp.api.util.FileUtils; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.BeanUtils; -import org.springframework.http.HttpRequest; -import org.springframework.http.server.ServletServerHttpRequest; import org.springframework.validation.BindingResult; import org.springframework.web.bind.annotation.*; import org.springframework.web.multipart.MultipartFile; @@ -41,9 +39,6 @@ import java.nio.charset.StandardCharsets; import java.util.ArrayList; import java.util.Arrays; import java.util.List; -import java.util.Map; -import java.util.function.Function; -import java.util.stream.Collectors; /** * 单据类型接口 @@ -183,7 +178,14 @@ public class BasicBussinessTypeController extends BaseController { if (bindingResult.hasErrors()) { return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage()); } - bussinessTypeFilterRequest.setUserId(getUserId()); + //判断是否是医院用户 + if (isHosUser()) { + bussinessTypeFilterRequest.setUserId(getUserId()); + } else { + //当前用户为供应商，查询单据类型添加允许供应商使用参数 + bussinessTypeFilterRequest.setSpUse(true); + } + List bussinessTypeEntities; bussinessTypeEntities = basicBussinessTypeService.filterJoinByUser( bussinessTypeFilterRequest); @@ -240,10 +242,10 @@ public class BasicBussinessTypeController extends BaseController { @PostMapping("/udiwms/bussinessType/file/upload") public BaseResponse uploadProducts(@RequestParam("file") List files, HttpServletRequest servletServerHttpRequest) { - String cookie=servletServerHttpRequest.getHeader("cookie"); - if(cookie!=null){ - cookie= Arrays.asList(cookie.split(";")).get(0); - cookie=cookie.substring(9); + String cookie = servletServerHttpRequest.getHeader("cookie"); + if (cookie != null) { + cookie = Arrays.asList(cookie.split(";")).get(0); + cookie = cookie.substring(9); } @@ -258,7 +260,7 @@ public class BasicBussinessTypeController extends BaseController { List bussinessTypeEntities = JSON.parseArray(json, BasicBussinessTypeEntity.class); if (bussinessTypeEntities != null && bussinessTypeEntities.size() > 0) { for (BasicBussinessTypeEntity bussinessTypeEntity : bussinessTypeEntities) { - basicBussinessTypeService.insertIgnoreBussinessType(bussinessTypeEntity,cookie); + basicBussinessTypeService.insertIgnoreBussinessType(bussinessTypeEntity, cookie); } } } catch (Exception e) { diff --git a/src/main/resources/mybatis/mapper/auth/InvWarehouseDao.xml b/src/main/resources/mybatis/mapper/auth/InvWarehouseDao.xml index e2e08f93..bcf9dbd5 100644 --- a/src/main/resources/mybatis/mapper/auth/InvWarehouseDao.xml +++ b/src/main/resources/mybatis/mapper/auth/InvWarehouseDao.xml @@ -373,6 +373,7 @@ AND auth_warehouse.spUse = #{spUse} + GROUP BY auth_warehouse.code