x

src/main/java/com/egolm/shop/controller/CommonController.java

@@ -111,6 +111,7 @@ public class CommonController {
 		} catch (EmptyResultDataAccessException e) {
 			throw new XException("配置不存在", e);
 		}
+		String sOrgNO = (String)map.get("sOrgNO");
 		String ossSql = "" +
 				" declare @ChoiceOssKEY varchar(20)   " + 
 				" select @ChoiceOssKEY=sValue1 from tSystemCtrl " + 
@@ -120,8 +121,9 @@ public class CommonController {
 				" where sCode = @ChoiceOssKEY";
 		Map<String, Object> omap = jdbcTemplate.queryForMap(ossSql.replaceAll("\\s+", " "));
 		Map<String, Object> cmap = jdbcTemplate.queryForMap("select sDesc,sValue1 from tSystemCtrl where sCode = 'ExemptCheck'");
-		List<Map<String, Object>> payTypes = jdbcTemplate.queryForList("select * from tCommon where sCommonNO = 'SOrderPayType' and nTag&1=0");
-		return Rjx.jsonOk().set("OrgInfo", map).set("PicInfo", omap).set("ExemptCheck", cmap).set("payTypes", payTypes).toJson();
+		List<Map<String, Object>> payTypes = jdbcTemplate.queryForList("select sSalesOrderPayTypeID, sSalesOrderPayType from tOrgPayType where sOrgNO = ? and nTag&1=0", sOrgNO);
+		List<Map<String, Object>> goodsTags = jdbcTemplate.queryForList("select sGoodsTagID, sGoodsTag where sOrgNO = ? and nTag&1 = 0", sOrgNO);
+		return Rjx.jsonOk().set("OrgInfo", map).set("PicInfo", omap).set("ExemptCheck", cmap).set("payTypes", payTypes).set("goodsTags", goodsTags).toJson();
 		
 	}
 }