Merge branch 'dev'

zhongzheng-system/src/main/java/com/zhongzheng/modules/order/service/impl/OrderServiceImpl.java

@@ -3766,8 +3766,10 @@ public class OrderServiceImpl extends ServiceImpl<OrderMapper, Order> implements
                 item.setOrderSnXY(orderSn);
 
                 //查询业务系统订单号
-                String orderSnYW = baseMapper.getOrderSnByYW(item.getOrderSn());
-                item.setOrderSnYW(orderSnYW);
+                if (StringUtils.isNotBlank(orderSn)){
+                    String orderSnYW = baseMapper.getOrderSnByYW(orderSn);
+                    item.setOrderSnYW(orderSnYW);
+                }
             });
         }
         return userStudyCondition;

zhongzheng-system/src/main/resources/mapper/modules/order/OrderMapper.xml

@@ -1216,7 +1216,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             AND o.tenant_id = #{tenantId}
         </if>
         <if test="userCard != null and userCard != ''">
-            AND AES_DECRYPT(UNHEX(u.id_card),'base20230213zzkj') = #{userCard}
+            AND UPPER(AES_DECRYPT(UNHEX(id_card),'base20230213zzkj')) = UPPER(#{userCard})
         </if>
         <if test="userName != null and userName != ''">
             AND u.realname = #{userName}
@@ -1257,7 +1257,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         AND cgu.`status` = 1
         AND o.tenant_id = 867735392558919680
         <if test="userCard != null and userCard != ''">
-            AND AES_DECRYPT(UNHEX(u.id_card),'base20230213zzkj') = #{userCard}
+            AND UPPER(AES_DECRYPT(UNHEX(id_card),'base20230213zzkj')) = UPPER(#{userCard})
         </if>
         <if test="userName != null and userName != ''">
             AND u.realname = #{userName}