rename /adminUser/list/communeAdm as /communeAdm/list/communeAdmUser

reset access for each member

src/main/java/com/ctrip/fun/admin/controller/market/CommuneAdmController.java

 package com.ctrip.fun.admin.controller.market;
 package com.ctrip.fun.admin.controller.market;
 
 
 
 
+import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.HashMap;
 import java.util.List;
 import java.util.List;
 import java.util.Map;
 import java.util.Map;
@@ -21,10 +22,12 @@ import org.springframework.web.bind.annotation.ResponseStatus;
 import com.ctrip.fun.admin.form.PaginationForm;
 import com.ctrip.fun.admin.form.PaginationForm;
 import com.ctrip.fun.admin.service.market.CommuneAdmService;
 import com.ctrip.fun.admin.service.market.CommuneAdmService;
 import com.ctrip.fun.admin.service.market.CommuneExtService;
 import com.ctrip.fun.admin.service.market.CommuneExtService;
+import com.ctrip.fun.admin.service.system.UserDetailsService;
 import com.ctrip.fun.admin.utility.SpringSecurityUtil;
 import com.ctrip.fun.admin.utility.SpringSecurityUtil;
 import com.ctrip.fun.common.vo.PagedResponseBean;
 import com.ctrip.fun.common.vo.PagedResponseBean;
 import com.ctrip.fun.common.vo.Response;
 import com.ctrip.fun.common.vo.Response;
 import com.ctrip.fun.common.vo.ResponseStatusEnum;
 import com.ctrip.fun.common.vo.ResponseStatusEnum;
+import com.ctrip.fun.common.vo.adminUser.AdminUserBean;
 import com.ctrip.fun.common.vo.product.CourseResourcePaymentBean;
 import com.ctrip.fun.common.vo.product.CourseResourcePaymentBean;
 import com.ctrip.fun.common.vo.user.CommuneAdmBean;
 import com.ctrip.fun.common.vo.user.CommuneAdmBean;
 import com.ctrip.fun.common.vo.user.CommuneAdmQuery;
 import com.ctrip.fun.common.vo.user.CommuneAdmQuery;
@@ -39,6 +42,8 @@ public class CommuneAdmController {
     private CommuneAdmService communeAdmService;
     private CommuneAdmService communeAdmService;
 	@Autowired
 	@Autowired
     private CommuneExtService communeExtService;
     private CommuneExtService communeExtService;
+	@Autowired
+	private UserDetailsService userDetailsService;
 	
 	
 	@RequestMapping(value = "queryList", method = RequestMethod.GET)
 	@RequestMapping(value = "queryList", method = RequestMethod.GET)
     public String queryList(HttpServletRequest request, @ModelAttribute("dto") CommuneAdmQuery query, ModelMap model) {
     public String queryList(HttpServletRequest request, @ModelAttribute("dto") CommuneAdmQuery query, ModelMap model) {
@@ -142,4 +147,25 @@ public class CommuneAdmController {
         return labelsList;
         return labelsList;
     }
     }
 	
 	
+    /**
+     * 获得会服人员列表
+     * @param request
+     * @return
+     */
+    @ResponseBody
+    @RequestMapping(value = "/list/communeAdmUser", method = RequestMethod.GET)
+    public List<Map<String,Object>> getCommuneAdmUserList(HttpServletRequest request) {
+    	List<Map<String,Object>> list = new ArrayList<Map<String,Object>>();
+    	Response<List<AdminUserBean>> response = userDetailsService.getCommuneAdmUserList(null);
+    	List<AdminUserBean> admUserList = response.getBody();
+    	for (AdminUserBean bean: admUserList){
+    		Map<String,Object> map = new HashMap<String,Object>();
+    		map.put("admUserId", bean.getId());
+    		map.put("admUsername", bean.getUserName());
+    		list.add(map);
+
+    	}
+		return list;
+    }
+	
 }
 }

src/main/java/com/ctrip/fun/admin/controller/system/adminUserController.java

@@ -82,25 +82,4 @@ public class adminUserController {
 
 
 	}
 	}
 	
 	
-    /**
-     * 获得会服人员列表
-     * @param request
-     * @return
-     */
-    @ResponseBody
-    @RequestMapping(value = "/list/communeAdm", method = RequestMethod.GET)
-    public List<Map<String,Object>> getCommuneAdmUserList(HttpServletRequest request) {
-    	List<Map<String,Object>> list = new ArrayList<Map<String,Object>>();
-    	Response<List<AdminUserBean>> response = userDetailsService.getCommuneAdmUserList(null);
-    	List<AdminUserBean> admUserList = response.getBody();
-    	for (AdminUserBean bean: admUserList){
-    		Map<String,Object> map = new HashMap<String,Object>();
-    		map.put("admUserId", bean.getId());
-    		map.put("admUsername", bean.getUserName());
-    		list.add(map);
-
-    	}
-		return list;
-    }
-	
 }
 }

src/main/resources/config/spring-security.xml

@@ -70,8 +70,8 @@
 		<sec:intercept-url pattern="/file/**" access="ROLE_OP,ROLE_DEV,ROLE_PROD,ROLE_RISK,ROLE_ASSIST,ROLE_COMMUNE" />
 		<sec:intercept-url pattern="/file/**" access="ROLE_OP,ROLE_DEV,ROLE_PROD,ROLE_RISK,ROLE_ASSIST,ROLE_COMMUNE" />
 		<sec:intercept-url pattern="/ingegral/**" access="ROLE_DEV,ROLE_USERINFO_MODIFY" />
 		<sec:intercept-url pattern="/ingegral/**" access="ROLE_DEV,ROLE_USERINFO_MODIFY" />
 		<sec:intercept-url pattern="/callcenter/sipPhone/**" access="ROLE_TEL,ROLE_ASSIST,ROLE_PROMOTION" />
 		<sec:intercept-url pattern="/callcenter/sipPhone/**" access="ROLE_TEL,ROLE_ASSIST,ROLE_PROMOTION" />
-		<sec:intercept-url pattern="/communeAdm/queryList/**" access="ROLE_COMMUNE_SYS_ADMIN" />
-		<sec:intercept-url pattern="/communeAdm/myBindList/**" access="ROLE_COMMUNE_SYS,ROLE_COMMUNE_SYS_ADMIN" />
+		<sec:intercept-url pattern="/communeAdm/queryList" access="ROLE_COMMUNE_SYS_ADMIN" />
+		<sec:intercept-url pattern="/communeAdm/**" access="ROLE_COMMUNE_SYS_ADMIN,ROLE_COMMUNE_SYS" />
 		<sec:intercept-url pattern="/**" access="ROLE_DEV" />
 		<sec:intercept-url pattern="/**" access="ROLE_DEV" />
 		<sec:form-login login-page="/adminUser/adminLoginGet" authentication-failure-url="/adminUser/adminLoginError" default-target-url="/marketing/campaign/create" />
 		<sec:form-login login-page="/adminUser/adminLoginGet" authentication-failure-url="/adminUser/adminLoginError" default-target-url="/marketing/campaign/create" />
 		
 		

src/main/webapp/WEB-INF/templates/market/communeAdm/list.ftl

@@ -54,7 +54,7 @@
 
 
 	$('#bindAdmModal').on('show.bs.modal', function (e) {
 	$('#bindAdmModal').on('show.bs.modal', function (e) {
 		//模态框显示之后加载当前所有会服人员
 		//模态框显示之后加载当前所有会服人员
-		$.get("/adminUser/list/communeAdm",{},function(data){
+		$.get("/communeAdm/list/communeAdmUser",{},function(data){
 			//返回找出所有的会服
 			//返回找出所有的会服
 			var html='<option value="0">请选择</option>';
 			var html='<option value="0">请选择</option>';