Merge remote-tracking branch 'origin/dev' into dev

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<BasicBussinessTypeEntity> pageInfo;
             pageInfo = new PageInfo<>(result);
@@ -229,6 +229,9 @@ public class BasicBussinessTypeController extends BaseController {
             List<BasicBussinessTypeResponse> bussinessTypeEntities;
             //判断是否是医院用户
             if (isHosUser()) {
+                if (bussinessTypeFilterRequest.getSpUse() == null) {
+                    bussinessTypeFilterRequest.setSpUse(3);
+                }
                 bussinessTypeFilterRequest.setUserId(getUserId());
                 bussinessTypeEntities = basicBussinessTypeService.filterJoinByUser(
                         bussinessTypeFilterRequest);

src/main/resources/mybatis/mapper/purchase/SupCertRemindMsgDao.xml

@@ -67,7 +67,7 @@
     <select id="selectProductRemindMsgList" resultType="com.glxp.api.res.purchase.SupCertRemindMsgResponse">
         select m.*,
                c.recordProductName                                                              `name`,
-               (select `name` from sup_cert s where s.code = m.code and s.productIdFk = m.idFk) certName
+               (select `name` from sup_cert s where s.code = m.code and s.productIdFk = m.idFk limit 1) certName
         from sup_cert_remind_msg m
                  left join sup_product c on m.idFk = c.productId
         left join sup_cert bc on bc.code = m.code