媒体wifi分组编辑页面

src/main/java/com/cloudcross/ssp/model/mapper/wifiGroupInfo.sql.xml

@@ -56,4 +56,8 @@
 		select twgi.id id,twgi.name name  from t_wifi_group_info twgi,t_adgroup_wifigroup taw where twgi.id = taw.wifigroup_id 
 		and taw.status = 0 and twgi.status = 0 and taw.adgroup_id=#{adgroupId}
 	</select>
+	
+	<select id="queryGroupNameAll" resultType="com.cloudcross.ssp.model.WifiGroupInfo" parameterType="java.util.Map">
+		select <include refid="column"/> from t_wifi_group_info where status != -1 and operator_id = #{operatorId} 
+	</select>
 </mapper>

src/main/java/com/cloudcross/ssp/service/IWifiGroupInfoService.java

@@ -24,4 +24,5 @@ public interface IWifiGroupInfoService extends IGenericService<WifiGroupInfo>{
 	public List<WifiGroupInfo> queryWifiGroupInfoByadgroupId(Long adgroupId);
 	public List<WifiGroupInfo> queryWifiGroupInfoByCondition(Map<String,Object>condition,Pager1 pager);
 	public Integer queryWifiGroupInfoCountByCondition(Map<String,Object>condition);
+	public List<WifiGroupInfo> queryGroupNameAll(Map<String,Object>map);
 }

src/main/java/com/cloudcross/ssp/service/impl/WifiGroupInfoService.java

@@ -1,5 +1,6 @@
 package com.cloudcross.ssp.service.impl;
 
+import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 
@@ -37,16 +38,17 @@ public class WifiGroupInfoService implements IWifiGroupInfoService{
 
 	@Override
 	public int countByParams(Map<String, Object> paramMap) {
-		/***********************************************/
 		return myBatisDao.get("wifiGroupInfoSqlMapper.queryGroupNamesCount",paramMap);
 	}
 
 	@Override
 	public List<WifiGroupInfo> findByParams(Map<String, Object> paramMap,Pager pager) {
-		/***********************************************/
 		return myBatisDao.getList("wifiGroupInfoSqlMapper.queryGroupNames",paramMap);
 	}
-
+	
+	public List<WifiGroupInfo> queryGroupNameAll(Map<String,Object>map) {
+		return myBatisDao.getList("wifiGroupInfoSqlMapper.queryGroupNameAll",map);
+	}
 	@Override
 	public boolean add(WifiGroupInfo wifiGroupInfo) {
 		myBatisDao.save("wifiGroupInfoSqlMapper.addWifiGroupInfo", wifiGroupInfo);

src/main/java/com/cloudcross/ssp/web/operator/main/ap/ApgroupController.java

@@ -291,9 +291,11 @@ public class ApgroupController extends SimpleController{
 		totalRow = wifiService.findWifiCountByCondition(paramMap);
 		pager.setPage(page);
 		pager.setTotalRow(totalRow);
-		
 		List<Wifi> wifiList = wifiService.findWifiByCondition(paramMap, pager);
-		List<WifiGroupInfo> listGroupName = this.wifiGroupInfoService.findByParams(null, null);
+		//分组名
+		Map<String,Object>map = new HashMap<String,Object>();
+		map.put("operatorId", getLoginUser().getOperatorId());
+		List<WifiGroupInfo> listGroupName = this.wifiGroupInfoService.queryGroupNameAll(map);
 		//如果下拉框传的是默认值，则回传一个对应的值给前端
 		if(null == cn) {
 			cn = "省";