From 86ed836dbf8924fc9d4d63f15acfb2acc4b2fc85 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=96=9B=E5=AE=87?= <2433098676@qq.com> Date: Tue, 25 Jul 2023 18:27:04 +0800 Subject: [PATCH 01/10] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E4=B8=9A=E5=8A=A1?= =?UTF-8?q?=E5=8D=95=E5=A1=AB=E5=86=99=E7=9A=84=E5=A4=87=E6=B3=A8=E4=BF=A1?= =?UTF-8?q?=E6=81=AF=EF=BC=8C=E5=9C=A8=E5=BE=85=E6=A0=A1=E9=AA=8C=E5=8D=95?= =?UTF-8?q?=E6=8D=AE=E4=B8=AD=E6=97=A0=E6=B3=95=E4=BF=AE=E6=94=B9=E6=88=90?= =?UTF-8?q?=E5=8A=9F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/glxp/api/controller/inout/IoOrderController.java | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/main/java/com/glxp/api/controller/inout/IoOrderController.java b/src/main/java/com/glxp/api/controller/inout/IoOrderController.java index 76869205..9b67ba1f 100644 --- a/src/main/java/com/glxp/api/controller/inout/IoOrderController.java +++ b/src/main/java/com/glxp/api/controller/inout/IoOrderController.java @@ -289,6 +289,9 @@ public class IoOrderController extends BaseController { public BaseResponse submitOrderWeb(@RequestBody AddOrderRequest addOrderRequest) { IoOrderEntity orderEntity = orderService.findByBillNo(addOrderRequest.getBillNo()); + if (StringUtils.isNotBlank(addOrderRequest.getRemark())) { + orderEntity.setRemark(addOrderRequest.getRemark()); + } BaseResponse tempResponse = checkSubmitEnable(orderEntity); if (tempResponse != null) return tempResponse; From 566733a841a5de0ccd95647217a4ce7ce7db0564 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=83=91=E6=98=8E=E6=A2=81?= <2429105222@qq.com> Date: Wed, 26 Jul 2023 11:13:19 +0800 Subject: [PATCH 02/10] =?UTF-8?q?=E5=8D=95=E6=8D=AE=E4=B8=8A=E4=BC=A0?= =?UTF-8?q?=E9=97=AE=E9=A2=98=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/glxp/api/service/inout/IoOrderUtilsService.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/com/glxp/api/service/inout/IoOrderUtilsService.java b/src/main/java/com/glxp/api/service/inout/IoOrderUtilsService.java index 11bef2f2..24ac15c6 100644 --- a/src/main/java/com/glxp/api/service/inout/IoOrderUtilsService.java +++ b/src/main/java/com/glxp/api/service/inout/IoOrderUtilsService.java @@ -61,7 +61,7 @@ public class IoOrderUtilsService { Boolean checkUdi = false; //判断是不是有错误 //根据供应商id查询用户id - AuthAdmin authAdmins = authAdminDao.findByCustomerld(platformLinkRespons.getUnitId()).get(0); + AuthAdmin authAdmins = authAdminDao.findByCustomerld(platformLinkRespons.getCustomerId()).get(0); //单据表生成 String billNO = gennerOrderUtils.createStOrderNo(new OrderNoTypeBean(Constant.SCAN_ORDER, "yyyyMMdd")); From 284394a17fc262c193a00df550741f8af12cf95e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=BB=84=E6=B3=BD=E8=85=BE?= <1178634255@qq.com> Date: Wed, 26 Jul 2023 17:29:39 +0800 Subject: [PATCH 03/10] =?UTF-8?q?=E5=86=85=E9=83=A8=E7=A0=81=E6=89=93?= =?UTF-8?q?=E5=8D=B0=EF=BC=8C=E9=80=89=E5=85=A5=E5=8D=95=E6=8D=AE=E5=90=8E?= =?UTF-8?q?=EF=BC=8C=E7=82=B9=E5=87=BB=20=E6=89=93=E5=8D=B0--=E7=94=9F?= =?UTF-8?q?=E6=88=90=E5=86=85=E9=83=A8=E7=A0=81=20=E6=97=B6=20=E6=8A=A5?= =?UTF-8?q?=E7=B3=BB=E7=BB=9F=E7=B9=81=E5=BF=99?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../glxp/api/controller/basic/BasicBussinessTypeController.java | 1 + .../java/com/glxp/api/res/basic/BasicBussinessTypeResponse.java | 2 +- src/main/resources/mybatis/mapper/basic/UdiRelevanceDao.xml | 2 +- 3 files changed, 3 insertions(+), 2 deletions(-) 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 c2d5ce70..03fb3280 100644 --- a/src/main/java/com/glxp/api/controller/basic/BasicBussinessTypeController.java +++ b/src/main/java/com/glxp/api/controller/basic/BasicBussinessTypeController.java @@ -216,6 +216,7 @@ public class BasicBussinessTypeController extends BaseController { } else { result.addAll(bussinessTypeEntities); } + System.out.println("result:"+result.toArray()); PageInfo pageInfo; pageInfo = new PageInfo<>(result); diff --git a/src/main/java/com/glxp/api/res/basic/BasicBussinessTypeResponse.java b/src/main/java/com/glxp/api/res/basic/BasicBussinessTypeResponse.java index 30bcfb37..cbe4d9d5 100644 --- a/src/main/java/com/glxp/api/res/basic/BasicBussinessTypeResponse.java +++ b/src/main/java/com/glxp/api/res/basic/BasicBussinessTypeResponse.java @@ -46,7 +46,7 @@ public class BasicBussinessTypeResponse { private Boolean changeEnable; private Boolean genUnit; private String defaultUnit; - private int spUse; + private Integer spUse; private Boolean secCheckEnable; private int checkUdims; private int checkPdaEd; diff --git a/src/main/resources/mybatis/mapper/basic/UdiRelevanceDao.xml b/src/main/resources/mybatis/mapper/basic/UdiRelevanceDao.xml index ffd86a3c..79c51809 100644 --- a/src/main/resources/mybatis/mapper/basic/UdiRelevanceDao.xml +++ b/src/main/resources/mybatis/mapper/basic/UdiRelevanceDao.xml @@ -141,7 +141,7 @@ AND basic_products.nameCode = #{nameCode} - + LIMIT 1 From c09b475ec8915aeaf8e99bb143f089d3db8922dd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=83=91=E6=98=8E=E6=A2=81?= <2429105222@qq.com> Date: Wed, 26 Jul 2023 18:00:50 +0800 Subject: [PATCH 04/10] =?UTF-8?q?=E5=8F=91=E7=A5=A8=E9=97=AE=E9=A2=98?= =?UTF-8?q?=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../resources/mybatis/mapper/inout/IoOrderInvoiceMapper.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/resources/mybatis/mapper/inout/IoOrderInvoiceMapper.xml b/src/main/resources/mybatis/mapper/inout/IoOrderInvoiceMapper.xml index e18f6660..b19c4f58 100644 --- a/src/main/resources/mybatis/mapper/inout/IoOrderInvoiceMapper.xml +++ b/src/main/resources/mybatis/mapper/inout/IoOrderInvoiceMapper.xml @@ -136,7 +136,7 @@ AND ic.invoiceEncode = #{invoiceEncode} - GROUP BY io.orderIdFk + group by io.id order by ic.updateTime desc From d2cc2d992f26b9899291282e951c74923d7df77f Mon Sep 17 00:00:00 2001 From: anthonywj Date: Wed, 26 Jul 2023 19:16:46 +0800 Subject: [PATCH 05/10] =?UTF-8?q?bug=E4=BF=AE=E6=94=B9=20=E8=80=97?= =?UTF-8?q?=E6=9D=90=E5=AD=97=E5=85=B8=E5=AD=97=E6=AE=B5=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../glxp/api/controller/inout/IoCodeTempController.java | 3 ++- .../com/glxp/api/entity/basic/UdiRelevanceEntity.java | 6 +++--- .../java/com/glxp/api/req/basic/UdiRelevanceRequest.java | 9 +++++++++ .../com/glxp/api/req/basic/UdiRelevanceSaveRequest.java | 8 ++++---- 4 files changed, 18 insertions(+), 8 deletions(-) diff --git a/src/main/java/com/glxp/api/controller/inout/IoCodeTempController.java b/src/main/java/com/glxp/api/controller/inout/IoCodeTempController.java index e90e4507..41469050 100644 --- a/src/main/java/com/glxp/api/controller/inout/IoCodeTempController.java +++ b/src/main/java/com/glxp/api/controller/inout/IoCodeTempController.java @@ -1192,7 +1192,8 @@ public class IoCodeTempController extends BaseController { //扫码数量-1 int orderCount = orderDetailCodeEntity.getCount(); orderDetailCodeEntity.setCount(orderCount - count); - orderDetailCodeEntity.setReCount(orderDetailCodeEntity.getCount() * udiCalCountUtil.getActCount(codeTempEntity.getNameCode())); + int reCount = count * udiCalCountUtil.getActCount(codeTempEntity.getNameCode()); + orderDetailCodeEntity.setReCount(IntUtil.value(orderDetailCodeEntity.getReCount()) - reCount); ioOrderDetailCodeService.update(orderDetailCodeEntity); } int b = codeTempService.updateById(codeTempEntity); diff --git a/src/main/java/com/glxp/api/entity/basic/UdiRelevanceEntity.java b/src/main/java/com/glxp/api/entity/basic/UdiRelevanceEntity.java index 2e489e97..0f1b1c7c 100644 --- a/src/main/java/com/glxp/api/entity/basic/UdiRelevanceEntity.java +++ b/src/main/java/com/glxp/api/entity/basic/UdiRelevanceEntity.java @@ -160,14 +160,14 @@ public class UdiRelevanceEntity { @TableField(value = "useExpireTime") private Integer useExpireTime; @TableField(value = "dispatch") - private boolean dispatch; + private Boolean dispatch; @TableField(value = "groupBuy") //是否可配送 - private boolean groupBuy; + private Boolean groupBuy; //是否集采产品 @TableField(value = "isDateBy") private Integer isDateBy; @TableField(value = "needCert") - private boolean needCert; //是否需要资质材料 + private Boolean needCert; //是否需要资质材料 @TableField(value = "certIdFk") private String certIdFk; diff --git a/src/main/java/com/glxp/api/req/basic/UdiRelevanceRequest.java b/src/main/java/com/glxp/api/req/basic/UdiRelevanceRequest.java index 2de29a4b..17e10273 100644 --- a/src/main/java/com/glxp/api/req/basic/UdiRelevanceRequest.java +++ b/src/main/java/com/glxp/api/req/basic/UdiRelevanceRequest.java @@ -1,5 +1,6 @@ package com.glxp.api.req.basic; +import com.baomidou.mybatisplus.annotation.TableField; import lombok.Data; @Data @@ -38,5 +39,13 @@ public class UdiRelevanceRequest { private Boolean useMuti; //是否多次使用 private Integer useNum; //最小包装单元可使用次数 + private Boolean dispatch; + private Boolean groupBuy; + //是否集采产品 + private Integer isDateBy; + private Boolean needCert; //是否需要资质材料 + + private String certIdFk; + } diff --git a/src/main/java/com/glxp/api/req/basic/UdiRelevanceSaveRequest.java b/src/main/java/com/glxp/api/req/basic/UdiRelevanceSaveRequest.java index d7c1527a..73d9419b 100644 --- a/src/main/java/com/glxp/api/req/basic/UdiRelevanceSaveRequest.java +++ b/src/main/java/com/glxp/api/req/basic/UdiRelevanceSaveRequest.java @@ -22,7 +22,7 @@ public class UdiRelevanceSaveRequest { private Boolean isLock; private Integer lockStatus; private Boolean isAdavence; - private boolean useMuti; + private Boolean useMuti; private Integer useNum; private String supName; private Date createTime; @@ -96,8 +96,8 @@ public class UdiRelevanceSaveRequest { private Boolean relSubmit; - private boolean dispatch; //是否可配送 - private boolean groupBuy; //是否集采产品 - private boolean needCert; //是否需要资质材料 + private Boolean dispatch; //是否可配送 + private Boolean groupBuy; //是否集采产品 + private Boolean needCert; //是否需要资质材料 private String certIdFk; } From da3ffff81b15fc1d6000ffd905b4c7077ca02ab0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=96=9B=E5=AE=87?= <2433098676@qq.com> Date: Thu, 27 Jul 2023 10:30:12 +0800 Subject: [PATCH 06/10] =?UTF-8?q?=E4=B8=9A=E5=8A=A1=E7=AE=A1=E7=90=86---?= =?UTF-8?q?=E9=87=87=E8=B4=AD=E8=AE=A2=E5=8D=95=E5=A4=84=E7=90=86=E7=AA=97?= =?UTF-8?q?=E5=8F=A3=E9=80=89=E6=8B=A9=E4=B8=8D=E4=BA=86=E5=85=A5=E5=BA=93?= =?UTF-8?q?=E5=8D=95=E6=8D=AE=E7=B1=BB=E5=9E=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../resources/mybatis/mapper/basic/BasicBussinessTypeDao.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/resources/mybatis/mapper/basic/BasicBussinessTypeDao.xml b/src/main/resources/mybatis/mapper/basic/BasicBussinessTypeDao.xml index 354f4012..5a7fceca 100644 --- a/src/main/resources/mybatis/mapper/basic/BasicBussinessTypeDao.xml +++ b/src/main/resources/mybatis/mapper/basic/BasicBussinessTypeDao.xml @@ -222,7 +222,7 @@ AND subInvCode = #{code} - AND subInvCode = #{code} + AND subInvCode = #{invCode} AND auth_user_bustype.`userId` = #{userId} From e1625cf500daa2e82c5250f0834961257259f5f0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=96=9B=E5=AE=87?= <2433098676@qq.com> Date: Thu, 27 Jul 2023 14:45:53 +0800 Subject: [PATCH 07/10] =?UTF-8?q?=E8=B5=84=E8=B4=A8=E9=A2=84=E8=AD=A6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../mybatis/mapper/purchase/SupCertRemindMsgDao.xml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/main/resources/mybatis/mapper/purchase/SupCertRemindMsgDao.xml b/src/main/resources/mybatis/mapper/purchase/SupCertRemindMsgDao.xml index ad8d712d..92772587 100644 --- a/src/main/resources/mybatis/mapper/purchase/SupCertRemindMsgDao.xml +++ b/src/main/resources/mybatis/mapper/purchase/SupCertRemindMsgDao.xml @@ -4,7 +4,7 @@ select m.*, c.companyName `name`, - (select `name` from sup_cert s where s.code = m.code and s.manufacturerIdFk = m.idFk) certName + (select `name` from sup_cert s where s.code = m.code and s.manufacturerIdFk = m.idFk limit 1) certName from sup_cert_remind_msg m - left join sup_manufacturer c on m.idFk = c.customerId + left join sup_manufacturer c on m.idFk = c.manufacturerId left join sup_cert bc on bc.code = m.code From 80225d5788a96ee54d106efb3eb5b0a45b4d649d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=83=91=E6=98=8E=E6=A2=81?= <2429105222@qq.com> Date: Thu, 27 Jul 2023 17:49:06 +0800 Subject: [PATCH 08/10] =?UTF-8?q?=E5=8D=95=E6=8D=AEbug=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/inout/IoCodeTempController.java | 13 +++++++++++++ .../api/service/inout/IoCodeTempService.java | 2 ++ .../inout/impl/IoCodeTempServiceImpl.java | 17 +++++++++++++++++ 3 files changed, 32 insertions(+) diff --git a/src/main/java/com/glxp/api/controller/inout/IoCodeTempController.java b/src/main/java/com/glxp/api/controller/inout/IoCodeTempController.java index 41469050..5c74bdde 100644 --- a/src/main/java/com/glxp/api/controller/inout/IoCodeTempController.java +++ b/src/main/java/com/glxp/api/controller/inout/IoCodeTempController.java @@ -1204,5 +1204,18 @@ public class IoCodeTempController extends BaseController { else return ResultVOUtils.error(500, "修改失败!"); } + @AuthRuleAnnotation("") + @PostMapping("warehouse/inout/checkTempCode") + public BaseResponse checkTempCode(@RequestBody IoCodeTempEntity codeTempEntity) { + + Boolean falg=codeTempService.checkTempCode(codeTempEntity); + if(!falg){ + return ResultVOUtils.error(999,"该产品已存在，请勿重复录入"); + } + + return ResultVOUtils.success(); + + } + } diff --git a/src/main/java/com/glxp/api/service/inout/IoCodeTempService.java b/src/main/java/com/glxp/api/service/inout/IoCodeTempService.java index 9510573b..016fe415 100644 --- a/src/main/java/com/glxp/api/service/inout/IoCodeTempService.java +++ b/src/main/java/com/glxp/api/service/inout/IoCodeTempService.java @@ -38,4 +38,6 @@ public interface IoCodeTempService { * @return */ List findCodeList(FilterCodeRequest filterCodeRequest); + + Boolean checkTempCode(IoCodeTempEntity ioCodeTempEntity); } diff --git a/src/main/java/com/glxp/api/service/inout/impl/IoCodeTempServiceImpl.java b/src/main/java/com/glxp/api/service/inout/impl/IoCodeTempServiceImpl.java index bb1b5fee..21827658 100644 --- a/src/main/java/com/glxp/api/service/inout/impl/IoCodeTempServiceImpl.java +++ b/src/main/java/com/glxp/api/service/inout/impl/IoCodeTempServiceImpl.java @@ -86,4 +86,21 @@ public class IoCodeTempServiceImpl implements IoCodeTempService { return ioCodeTempDao.selectCodeList(filterCodeRequest); } + @Override + public Boolean checkTempCode(IoCodeTempEntity ioCodeTempEntity) { + + QueryWrapper ew=new QueryWrapper<>(); + ew.eq("code",ioCodeTempEntity.getCode()); + ew.eq("corpOrderId",ioCodeTempEntity.getCorpOrderId()); + ew.eq("batchNo",ioCodeTempEntity.getBatchNo()); + ew.eq("produceDate",ioCodeTempEntity.getProduceDate()); + ew.eq("expireDate",ioCodeTempEntity.getExpireDate()); + ew.eq("serialNo",ioCodeTempEntity.getSerialNo()); + Long count = ioCodeTempDao.selectCount(ew); + if(count>0){ + return false; + } + return true; + } + } From 5194ab6afa1e3aa55f5dd178cf5b491099887b59 Mon Sep 17 00:00:00 2001 From: anthonywj Date: Sat, 29 Jul 2023 20:41:50 +0800 Subject: [PATCH 09/10] =?UTF-8?q?bug=E4=BF=AE=E6=94=B9=20=E8=80=97?= =?UTF-8?q?=E6=9D=90=E5=AD=97=E5=85=B8=E5=AD=97=E6=AE=B5=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../glxp/api/controller/basic/UdiContrastController.java | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/src/main/java/com/glxp/api/controller/basic/UdiContrastController.java b/src/main/java/com/glxp/api/controller/basic/UdiContrastController.java index fa461f01..ffcb9a99 100644 --- a/src/main/java/com/glxp/api/controller/basic/UdiContrastController.java +++ b/src/main/java/com/glxp/api/controller/basic/UdiContrastController.java @@ -33,6 +33,7 @@ import com.glxp.api.service.thrsys.ThrSystemService; import com.glxp.api.util.CustomUtil; import com.glxp.api.util.udi.UdiInfoUtil; import org.springframework.beans.BeanUtils; +import org.springframework.transaction.annotation.Transactional; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestBody; @@ -173,20 +174,24 @@ public class UdiContrastController { /** * 切换耗材字典版本号 */ + @Transactional(rollbackFor = Exception.class) @AuthRuleAnnotation("") @PostMapping("/udi/udirel/syncOnline") @Log(title = "耗材字典", businessType = BusinessType.UPDATE) public BaseResponse syncOnline(@RequestBody UdiCombineRequest udiCombineRequest) { - List udiInfoEntities = udiDlHttpClient.getUdiByUuid(udiCombineRequest.getOriginUuid()); + List udiInfoEntities = udiProductService.findByOriginUuid(udiCombineRequest.getOriginUuid()); if (CollUtil.isNotEmpty(udiInfoEntities)) { + String newUuid = null; BaseResponse> listBaseResponse = asyncDiDlHelper.dlLastVersionByDi(udiInfoEntities.get(0).getNameCode()); if (listBaseResponse.getCode() == 20000) { List productInfoEntityList = listBaseResponse.getData(); if (CollUtil.isNotEmpty(productInfoEntityList)) { productInfoService.insertProductInfos(productInfoEntityList); + newUuid = productInfoEntityList.get(0).getUuid(); } } - udiInfoEntities = udiDlHttpClient.getUdiByUuid(udiCombineRequest.getOriginUuid()); + + udiInfoEntities = udiDlHttpClient.getUdiByUuid(newUuid); udiProductService.deleteByUuid(udiCombineRequest.getUuid()); for (UdiProductEntity udiProductEntity : udiInfoEntities) { udiProductEntity.setUuid(udiCombineRequest.getUuid()); From 532c75ac113d3834d5200959b7b30ca23f9b54a1 Mon Sep 17 00:00:00 2001 From: anthonywj Date: Sun, 30 Jul 2023 10:49:32 +0800 Subject: [PATCH 10/10] =?UTF-8?q?=E9=87=87=E8=B4=AD=E8=AE=A2=E5=8D=95?= =?UTF-8?q?=E6=97=A0=E6=B3=95=E9=80=89=E6=8B=A9=E9=80=81=E8=B4=A7=E5=8D=95?= =?UTF-8?q?=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../api/controller/basic/BasicBussinessTypeController.java | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) 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 03fb3280..d6f3ed16 100644 --- a/src/main/java/com/glxp/api/controller/basic/BasicBussinessTypeController.java +++ b/src/main/java/com/glxp/api/controller/basic/BasicBussinessTypeController.java @@ -216,7 +216,7 @@ public class BasicBussinessTypeController extends BaseController { } else { result.addAll(bussinessTypeEntities); } - System.out.println("result:"+result.toArray()); + System.out.println("result:" + result.toArray()); PageInfo pageInfo; pageInfo = new PageInfo<>(result); @@ -229,6 +229,9 @@ public class BasicBussinessTypeController extends BaseController { List bussinessTypeEntities; //判断是否是医院用户 if (isHosUser()) { + if (bussinessTypeFilterRequest.getSpUse() == null) { + bussinessTypeFilterRequest.setSpUse(3); + } bussinessTypeFilterRequest.setUserId(getUserId()); bussinessTypeEntities = basicBussinessTypeService.filterJoinByUser( bussinessTypeFilterRequest);