Commit c0032799 by java-李谡

角色分配人员选择显示登陆账号

parent a06ded9e
...@@ -36,10 +36,12 @@ ...@@ -36,10 +36,12 @@
var selectedNodes =[ var selectedNodes =[
<c:forEach items="${userList}" var="user"> <c:forEach items="${userList}" var="user">
{id:"${user.id}", {
pId:"0", id: "${user.id}",
name:"<font color='red' style='font-weight:bold;'>${user.name}</font>"}, pId: "0",
</c:forEach>]; name: "<font color='red' style='font-weight:bold;'>${user.name}(${user.loginName})</font>"
},
</c:forEach>];
var pre_ids = "${selectIds}".split(","); var pre_ids = "${selectIds}".split(",");
var ids = "${selectIds}".split(","); var ids = "${selectIds}".split(",");
......
...@@ -3,34 +3,32 @@ ...@@ -3,34 +3,32 @@
*/ */
package com.ejweb.modules.sys.web; package com.ejweb.modules.sys.web;
import java.util.List; import com.ejweb.core.base.BaseController;
import java.util.Map;
import javax.servlet.http.HttpServletResponse;
import org.apache.shiro.authz.annotation.RequiresPermissions;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Controller;
import org.springframework.ui.Model;
import org.springframework.web.bind.annotation.ModelAttribute;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestParam;
import org.springframework.web.bind.annotation.ResponseBody;
import org.springframework.web.servlet.mvc.support.RedirectAttributes;
import com.google.common.collect.Lists;
import com.google.common.collect.Maps;
import com.ejweb.core.conf.GConstants; import com.ejweb.core.conf.GConstants;
import com.ejweb.core.persistence.Page; import com.ejweb.core.persistence.Page;
import com.ejweb.core.utils.Collections3; import com.ejweb.core.utils.Collections3;
import com.ejweb.core.utils.StringUtils; import com.ejweb.core.utils.StringUtils;
import com.ejweb.core.base.BaseController;
import com.ejweb.modules.sys.entity.Office; import com.ejweb.modules.sys.entity.Office;
import com.ejweb.modules.sys.entity.Role; import com.ejweb.modules.sys.entity.Role;
import com.ejweb.modules.sys.entity.User; import com.ejweb.modules.sys.entity.User;
import com.ejweb.modules.sys.service.OfficeService; import com.ejweb.modules.sys.service.OfficeService;
import com.ejweb.modules.sys.service.SystemService; import com.ejweb.modules.sys.service.SystemService;
import com.ejweb.modules.sys.utils.UserUtils; import com.ejweb.modules.sys.utils.UserUtils;
import com.google.common.collect.Lists;
import com.google.common.collect.Maps;
import org.apache.shiro.authz.annotation.RequiresPermissions;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Controller;
import org.springframework.ui.Model;
import org.springframework.web.bind.annotation.ModelAttribute;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestParam;
import org.springframework.web.bind.annotation.ResponseBody;
import org.springframework.web.servlet.mvc.support.RedirectAttributes;
import javax.servlet.http.HttpServletResponse;
import java.util.List;
import java.util.Map;
/** /**
* 角色Controller * 角色Controller
...@@ -173,7 +171,7 @@ public class RoleController extends BaseController { ...@@ -173,7 +171,7 @@ public class RoleController extends BaseController {
Map<String, Object> map = Maps.newHashMap(); Map<String, Object> map = Maps.newHashMap();
map.put("id", e.getId()); map.put("id", e.getId());
map.put("pId", 0); map.put("pId", 0);
map.put("name", e.getName()); map.put("name", e.getName() + "(" + e.getLoginName() + ")");
mapList.add(map); mapList.add(map);
} }
return mapList; return mapList;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment