下

src/main/java/com/egolm/shop/service/impl/BrandServiceImpl.java

@@ -151,8 +151,8 @@ public class BrandServiceImpl implements BrandService {
 		
 		String sql = "SELECT IPID = a.sIPID, AgentContractNO = a.sAgentContractNO,OrgName = o.sOrgDesc,BrandID = a.sBrandID, BrandName = b.sBrandName,IPBrandTypeID = a.sIPBrandTypeID,"
 				+ " IPBrandType = a.sIPBrandType, LogoUrl = a.sLogoUrl,Introduce = a.sIntroduce,Describe = a.sDescribe,Memo = a.sMemo, ba.nTag nTag_dtl, ba.sReason, "
-				+ "case when ba.nTag&1 = 1 then 1 when ba.nTag&2 = 0 then 2 when ba.nTag&2 = 2 then 3 else 0 end status,  "
-				+ "case when ba.nTag&1 = 1 then '已否决'  when ba.nTag&2 = 0 then '未审核'  when ba.nTag&2 = 2 then '已审核'  else '审核中'  end statusDesc "
+				+ "case when ba.nTag is null then 0 when ba.nTag&1 = 1 then 1 when ba.nTag&2 = 0 then 2 when ba.nTag&2 = 2 then 3 else 4 end status,  "
+				+ "case when ba.nTag is null then '未提交'  when ba.nTag&1 = 1 then '已否决'  when ba.nTag&2 = 0 then '未审核'  when ba.nTag&2 = 2 then '已审核'  else '审核中'  end statusDesc "
 				+ "   FROM  tIPBrand a left join tIPBrandAuthorize ba on ba.sIPID = a.sIPID and ba.sCustNO = ? join tOrg o on a.sOrgNO = o.sOrgNO join tBrand b on a.sBrandID = b.sBrandID "
 				+ "  WHERE a.sIPID = ?  and a.sOrgNO = ? and a.nTag=2 ";
 		Map<String,Object> map = jdbcTemplate.queryForMap(sql,custNo,ipId,orgNO);