@@ -287,15 +287,4 @@ public class GoodsServiceImpl implements GoodsService {
returnmm;
}
publicstaticvoidmain(String[]arg){
StringorgNo="1001";
List<String>args=newArrayList<String>();
args.add("(t.sAgentContractNO = '600001001' and t.nGoodsID = 519)");
Stringsql1="select t.sAgentContractNO, t.nGoodsID, p.sPromoTheme, p.sPromoName, p.sPromoPaperNO, p.sPromoActionTypeID, t.sGroupNO sPromoGroupNO from tYWPromoDtl t, tYWPromoMain p where p.sPromoActionTypeID != '3' and t.sPromoPaperNO = p.sPromoPaperNO and p.nTag&3 = 2 and p.sOrgNO = '"+orgNo+"' "+StringUtil.join(" OR "," and (",")"," and (1 = 0) ",args)+" group by t.sAgentContractNO, t.nGoodsID, p.sPromoTheme, p.sPromoName, p.sPromoPaperNO, p.sPromoActionTypeID, t.sGroupNO";