1.修复部分已知问题

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<InvWarehouseEntity> list = invWarehouseService.findInvListByUser(filterInvWarehouseRequest);

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());
         }
+        //判断是否是医院用户
+        if (isHosUser()) {
             bussinessTypeFilterRequest.setUserId(getUserId());
+        } else {
+            //当前用户为供应商，查询单据类型添加允许供应商使用参数
+            bussinessTypeFilterRequest.setSpUse(true);
+        }
+
         List<BasicBussinessTypeResponse> 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<MultipartFile> 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<BasicBussinessTypeEntity> 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) {

src/main/resources/mybatis/mapper/auth/InvWarehouseDao.xml

@@ -373,6 +373,7 @@
                 AND auth_warehouse.spUse = #{spUse}
             </if>
         </where>
+        GROUP BY auth_warehouse.code
     </select>
 
     <select id="selectParentIdByCode" resultType="java.lang.String">

src/main/resources/mybatis/mapper/basic/BasicBussinessTypeDao.xml

@@ -237,6 +237,9 @@
             <if test="userId != ''and userId != null">
                 AND auth_user_bustype.`userId` = #{userId}
             </if>
+            <if test="spUse != null">
+                AND basic_bussiness_type.spUse = #{spUse}
+            </if>
         </where>
         group by basic_bussiness_type.action
     </select>