6月小版本

src/main/resources/mappings/modules/product/ProductNewMapper.xml

@@ -6,8 +6,8 @@
         <result property="name" column="name"/>
     </resultMap>
     <sql id="productColumns">
-        a.newProductType,
         a.newvalidFlag,
+       ifnull(a.newProductType,2),
         ifnull(a.announType,1),
         a.productID AS "id",
         a.productID AS "productID",

src/main/webapp/WEB-INF/views/modules/product-new/productList.jsp

@@ -278,7 +278,7 @@
 						<font color="darkorange">未参与</font>
 					</c:if>
 					<c:if test="${product.newProductType eq null}">
-						<font color="red">未参与</font>
+						<font color="darkorange">未参与</font>
 					</c:if>
 					<c:if test="${product.newProductType eq 1}">
 						<font color="darkorange">参与</font>
@@ -288,7 +288,7 @@
 					<c:if test="${product.newvalidFlag eq 1}">
 						<font color="green">审核通过</font>
 					</c:if>
-					<c:if test="${product.newvalidFlag eq 3}">
+					<c:if test="${product.newvalidFlag eq 0}">
 						<font color="green">待审核</font>
 					</c:if>
 					<c:if test="${product.newvalidFlag eq 2}">