修复角色bug

src/main/java/com/ctrip/fun/admin/controller/userRole/UserRoleController.java

@@ -10,6 +10,7 @@ import javax.servlet.http.HttpServletRequest;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Controller;
 import org.springframework.ui.ModelMap;
+import org.springframework.util.StringUtils;
 import org.springframework.web.bind.annotation.ModelAttribute;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestMethod;
@@ -117,6 +118,7 @@ public class UserRoleController {
         query.setRoleName(form.getRoleName());
         query.setPagerOffset(currentPage * query.getPagerPerPage());
         query.setSortField("id");
+        query.setRoleDescription(form.getDescription());
         PagedResponseBean<AdminRoleBean> response  = userRoleService.getRolelist("", query);
         int pageSize = query.getPagerPerPage();
         int total = response.getCount();
@@ -172,6 +174,7 @@ public class UserRoleController {
     public String editRolePost(HttpServletRequest request, @ModelAttribute("form") UserRoleForm form, @RequestParam(value = "id", required = true) int id, ModelMap model) {
     	AdminRoleBean bean = new AdminRoleBean();
     	BeanConverter.copyProperties(bean, form);
+    	bean.setName(form.getRoleName());
     	userRoleService.updateAdminRole("", bean);
         return "redirect:roleList";
     }
@@ -189,8 +192,19 @@ public class UserRoleController {
     public String createResource(@ModelAttribute("form") UserResourcesForm form, ModelMap model) {
     	AdminResourcesBean bean = new AdminResourcesBean();
         BeanConverter.copyProperties(bean, form);
+        if(StringUtils.isEmpty(form.getLevel())){
+        	bean.setLevel(null);
+        }
+        if(StringUtils.isEmpty(form.getParentId())){
+        	bean.setParentId(null);
+        }
         userRoleService.addAdminResources("", bean);
         return "redirect:roleList";
     }
     
+    @RequestMapping(value = "/deleteRole", method = RequestMethod.GET)
+    public String deleteRole(HttpServletRequest request, @ModelAttribute("form") UserRoleForm form, @RequestParam(value = "id", required = true) int id, ModelMap model) {
+    	userRoleService.deleteRole("", form.getId());
+        return "redirect:roleList";
+    }
 }

src/main/java/com/ctrip/fun/admin/service/userRole/UserRoleService.java

@@ -309,4 +309,30 @@ public class UserRoleService extends BaseService {
         return id;
 	}
 
+	public Integer deleteRole(String userId, Integer id) {
+		String uri = super.getServiceUri("uri.adminUser.deleteAdminRole");
+		Integer result  = null;
+
+        Request<Integer> request = new Request<Integer>();
+        request.setUserId(userId);
+        request.setBody(id);
+        HttpEntity<Request<Integer>> httpEntity = new HttpEntity<Request<Integer>>(
+                request);
+        Response<Integer> response = super.exchange(uri, HttpMethod.POST,
+                httpEntity,
+                new ParameterizedTypeReference<Response<Integer>>() {
+                }).getBody();
+        if (response.getStatus() == ResponseStatusEnum.SUCCESS.getValue()) {
+        	result = response.getBody();
+        } else {
+            Map<String, String> tags = new HashMap<>();
+            tags.put("userId", userId);
+            logger.error(
+                    "用户list异常",
+                    String.format("status: %d, msg: %s", response.getStatus(),
+                            response.getMessage()), tags);
+        }
+        return result;
+	}
+    
 }

src/main/resources/properties/service.properties

@@ -38,6 +38,7 @@ uri.adminUser.addRole=/fun-golf-service/adminUser/addRole
 uri.adminUser.getUserRoleById=/fun-golf-service/adminUser/getUserRoleById
 uri.adminUser.updateAdminRole=/fun-golf-service/adminUser/updateAdminRole
 uri.adminUser.addResources=/fun-golf-service/adminUser/addResources
+uri.adminUser.deleteAdminRole=/fun-golf-service/adminUser/deleteAdminRole
 # order
 uri.order.placeOrder=/fun-golf-service/{orderType}/placeOrder
 uri.order.list=/fun-golf-service/{orderType}/list

src/main/webapp/WEB-INF/templates/userRole/adminResourcesForm.ftl

@@ -27,13 +27,21 @@
         <div class="row-fluid show-grid">
             <@form.hidden "form.id"/>
             <@form.textInput path="form.name" attributes="class=\"input-medium\" pattern=\".{1,64}\" required" label="资源名称" required = true />
-            <@form.textInput path="form.parentId" attributes="class=\"input-medium\" pattern=\".{1,64}\" " label="父级id" />
+            <@form.textInput path="form.resUrl" attributes="class=\"input-medium\" pattern=\".{1,64}\" required" label="资源路径" required = true />
+            <@form.textInput path="form.description" attributes="class=\"input-medium\" pattern=\".{1,64}\" required" label="资源描述" required = true />
+            
+            <!--<@form.textInput path="form.parentId" attributes="class=\"input-medium\" pattern=\".{1,64}\" " label="父级id" />-->
             <@form.textInput path="form.resKey" attributes="class=\"input-medium\" pattern=\".{1,64}\" " label="key" />
             <@form.textInput path="form.type" attributes="class=\"input-medium\" pattern=\".{1,64}\" " label="类别" />
-            <@form.textInput path="form.resUrl" attributes="class=\"input-medium\" pattern=\".{1,64}\" required" label="资源路径" required = true />
             <@form.textInput path="form.level" attributes="class=\"input-medium\" pattern=\".{1,64}\" " label="级别" />
-            <@form.textInput path="form.description" attributes="class=\"input-medium\" pattern=\".{1,64}\" required" label="资源描述" required = true />
-            <@form.checkbox "form.enable" "" "可用"/>
+            type</br>
+            <select name="parentId">
+              <option value ="">-请选择类型-</option>
+			  <option value ="1">菜单</option>
+			  <option value ="2">路径</option>
+			  <option value="3">其他</option>
+			</select>
+			</br></br>
          </div>
             <div class="control-group">
                 <div class="controls">

src/main/webapp/WEB-INF/templates/userRole/roleListAll.ftl

@@ -22,7 +22,10 @@
         	<td >${item.name!}</td>
             <td >${item.description!}</td>
             <td >${item.resStr!}</td>
-            <td><a title='' href="/userRole/adminUser/editRole?id=${item.id}">编辑</a></td>
+            <td>
+            <a title='' href="/userRole/adminUser/editRole?id=${item.id}">编辑</a>&nbsp;&nbsp;&nbsp;
+            <a title='' href="/userRole/adminUser/deleteRole?id=${item.id}">删除</a>
+            </td>
         </tr>
         </#list>
     </tbody>