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

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;

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

@@ -222,7 +222,7 @@
                 AND subInvCode = #{code}
             </if>
             <if test="invCode != ''and invCode != null">
-                AND subInvCode = #{code}
+                AND subInvCode = #{invCode}
             </if>
             <if test="userId != ''and userId != null">
                 AND auth_user_bustype.`userId` = #{userId}

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

@@ -4,7 +4,7 @@
     <select id="selectSupRemindMsgList" resultType="com.glxp.api.res.purchase.SupCertRemindMsgResponse">
         select m.*,
                c.companyName                                                                   `name`,
-               (select `name` from sup_cert s where s.code = m.code and s.CustomerId = m.idFk) certName
+               (select `name` from sup_cert s where s.code = m.code and s.CustomerId = m.idFk limit 1) certName
         from sup_cert_remind_msg m
                  left join sup_company c on m.idFk = c.customerId
         left join sup_cert bc on bc.code = m.code
@@ -36,9 +36,9 @@
     <select id="selectManufactureRemindMsgList" resultType="com.glxp.api.res.purchase.SupCertRemindMsgResponse">
         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
         <where>
             <if test="supId != null and supId != ''">