bugfix

src/main/resources/mappings/modules/order/OrderMapper.xml

@@ -134,12 +134,9 @@
             <if test="orderNo != null and orderNo != ''">
                 AND co.orderNo = #{orderNo}
             </if>
-			<if test="organizeID != null and organizeID != '' and organizeID != 0 ">
+			<if test="organizeID != null">
 				AND co.organizeID = #{organizeID}
 			</if>
-			<if test="organizeID == 0 ">
-				AND (co.organizeID IS NULL OR co.organizeID = 2)
-			</if>
             <if test="status != null and status != ''">
 				<choose>
 					<when test="status == '99'.toString()">
@@ -639,12 +636,9 @@
             <if test="orderID != null and orderID != ''">
                 AND co.orderID = #{orderID}
             </if>
-			<if test="organizeID != null and organizeID != '' and organizeID != 0 ">
+			<if test="organizeID != null">
 				AND co.organizeID = #{organizeID}
 			</if>
-			<if test="organizeID == 0 ">
-				AND (co.organizeID IS NULL OR co.organizeID = 2)
-			</if>
             <if test="orderNo != null and orderNo != ''">
                 AND co.orderNo like concat('%', #{orderNo} ,'%')
             </if>

src/main/webapp/WEB-INF/views/modules/bulkpurchase/orderConfirmReturnRecord.jsp

@@ -68,6 +68,8 @@
             background: #fff;
             display: none;
         }
+
+        .weishaIcon {background:darkorange;color:white;margin:0 0px;padding:0 3px;font-style:normal;font-size: 12px; display:inline-block;border-radius:2px}
     </style>
     <style media="print">
         @page {
@@ -411,7 +413,7 @@
     </tr>
     <tr>
         <td>
-            机构：${order.bpOrderUserinfo.name}
+            机构：${order.bpOrderUserinfo.name}<c:if test="${order.organizeID == 3}"><em class="weishaIcon">维沙</em></c:if>
         </td>
         <td>
             收货人：${order.bpOrderUserinfo.shouHuoRen}(${order.bpOrderUserinfo.mobile})

src/main/webapp/WEB-INF/views/modules/bulkpurchase/orderReviewReturnRecord.jsp

@@ -28,6 +28,7 @@
         .upload-tips{margin:10px 0}
         .refund-btn-top{float:right;margin-top:-18px;margin-right:10px;height:40px}
         #enlarge-box{position:fixed;top:50%;left:50%;transform:translate(-50%,-50%);border:2px solid #eee;background:#fff;display:none}
+        .weishaIcon {background:darkorange;color:white;margin:0 0px;padding:0 3px;font-style:normal;font-size: 12px; display:inline-block;border-radius:2px}
     </style>
     <script type="text/javascript">
         $(document).ready(function () {
@@ -400,7 +401,7 @@
     </tr>
     <tr>
         <td>
-            买家：${order.bpOrderUserinfo.name}
+            买家：${order.bpOrderUserinfo.name}<c:if test="${order.organizeID == 3}"><em class="weishaIcon">维沙</em></c:if>
         </td>
         <td>
             收货人：${order.bpOrderUserinfo.shouHuoRen}(${order.bpOrderUserinfo.mobile})

src/main/webapp/WEB-INF/views/modules/order/cmReturnedPurchaseList.jsp

@@ -163,7 +163,7 @@
 					<c:if test="${cmReturnedPurchase.organizeID == 1}">
 						<span class="org-note">星范</span>
 					</c:if>
-						${cmReturnedPurchase.name}<c:if test="${order.organizeID == 3}"><em class="weishaIcon">维沙</em></c:if>
+						${cmReturnedPurchase.name}<c:if test="${cmReturnedPurchase.organizeID == 3}"><em class="weishaIcon">维沙</em></c:if>
 				</td>
 				<td>${cmReturnedPurchase.orderNo}(${cmReturnedPurchase.orderID})</td>
 				<td><fmt:formatNumber type="number" pattern="#,##0.00"