diff --git a/contact-center/app/src/main/java/com/chatopera/cc/controller/LoginController.java b/contact-center/app/src/main/java/com/chatopera/cc/controller/LoginController.java index c95b3b21..82aed08f 100644 --- a/contact-center/app/src/main/java/com/chatopera/cc/controller/LoginController.java +++ b/contact-center/app/src/main/java/com/chatopera/cc/controller/LoginController.java @@ -238,6 +238,11 @@ public class LoginController extends Handler { if (StringUtils.isNotBlank(referer)) { view.addObject("referer", referer); } + if (StringUtils.isNotBlank(noticeLoginBanner) && !StringUtils.equalsIgnoreCase(noticeLoginBanner, "off")) { + view.addObject("noticeLoginBanner", noticeLoginBanner); + } else { + view.addObject("noticeLoginBanner", "off"); + } view.addObject("msg", "0"); } } diff --git a/contact-center/app/src/main/java/com/chatopera/cc/controller/admin/OrganController.java b/contact-center/app/src/main/java/com/chatopera/cc/controller/admin/OrganController.java index 86bdeaba..a061182f 100644 --- a/contact-center/app/src/main/java/com/chatopera/cc/controller/admin/OrganController.java +++ b/contact-center/app/src/main/java/com/chatopera/cc/controller/admin/OrganController.java @@ -88,6 +88,7 @@ public class OrganController extends Handler { @RequestMapping("/index") @Menu(type = "admin", subtype = "organ") public ModelAndView index(ModelMap map, HttpServletRequest request, @Valid String organ, @Valid String msg) { + Organ currentOrgan = super.getOrgan(request); List organList = organRepository.findByOrgi(super.getOrgi()); map.addAttribute("organList", getOwnOragans(request)); if (organList.size() > 0) { @@ -100,7 +101,7 @@ public class OrganController extends Handler { } } } else { - map.addAttribute("organData", organData = super.getOrgan(request)); + map.addAttribute("organData", organData = currentOrgan); } if (organData != null) { map.addAttribute( @@ -132,6 +133,7 @@ public class OrganController extends Handler { } } + map.addAttribute("currentOrgan", currentOrgan); map.addAttribute("areaList", areaRepository.findByOrgi(super.getOrgi())); map.addAttribute("roleList", roleRepository.findByOrgi(super.getOrgi())); map.put("msg", msg); diff --git a/contact-center/app/src/main/java/com/chatopera/cc/controller/admin/RoleController.java b/contact-center/app/src/main/java/com/chatopera/cc/controller/admin/RoleController.java index 3ab1bbed..d17b5ca9 100644 --- a/contact-center/app/src/main/java/com/chatopera/cc/controller/admin/RoleController.java +++ b/contact-center/app/src/main/java/com/chatopera/cc/controller/admin/RoleController.java @@ -74,6 +74,7 @@ public class RoleController extends Handler { List roleList = roleRepository.findByOrgiAndOrgan(super.getOrgi(),currentOrgan.getId()); map.addAttribute("roleList", roleList); map.addAttribute("msg", msg); + map.addAttribute("currentOrgan", currentOrgan); if (roleList.size() > 0) { Role roleData = null; if (StringUtils.isNotBlank(role)) { diff --git a/contact-center/app/src/main/java/com/chatopera/cc/controller/admin/UsersController.java b/contact-center/app/src/main/java/com/chatopera/cc/controller/admin/UsersController.java index 7bb85dee..9ba4f391 100644 --- a/contact-center/app/src/main/java/com/chatopera/cc/controller/admin/UsersController.java +++ b/contact-center/app/src/main/java/com/chatopera/cc/controller/admin/UsersController.java @@ -40,6 +40,8 @@ import org.springframework.web.servlet.ModelAndView; import javax.servlet.http.HttpServletRequest; import javax.validation.Valid; import java.io.IOException; +import java.util.ArrayList; +import java.util.HashSet; import java.util.List; import java.util.Map; @@ -74,13 +76,22 @@ public class UsersController extends Handler { @Autowired private ExtensionRepository extensionRes; + /** + * 只返回根用户:只属于该部门的非下级部门的用户 + * @param map + * @param request + * @return + * @throws IOException + */ @RequestMapping("/index") @Menu(type = "admin", subtype = "user") public ModelAndView index(ModelMap map, HttpServletRequest request) throws IOException { - User logined = super.getUser(request); + Organ currentOrgan = super.getOrgan(request); + ArrayList organs = new ArrayList<>(); + organs.add(currentOrgan.getId()); - Map organs = organProxy.findAllOrganByParentAndOrgi(super.getOrgan(request), super.getOrgi(request)); - map.addAttribute("userList", userProxy.findUserInOrgans(organs.keySet(), new PageRequest( + map.addAttribute("currentOrgan", currentOrgan); + map.addAttribute("userList", userProxy.findUserInOrgans(organs, new PageRequest( super.getP(request), super.getPs(request), Sort.Direction.ASC, diff --git a/contact-center/app/src/main/java/com/chatopera/cc/controller/admin/system/TemplateController.java b/contact-center/app/src/main/java/com/chatopera/cc/controller/admin/system/TemplateController.java index ee4fe314..8a131e1d 100644 --- a/contact-center/app/src/main/java/com/chatopera/cc/controller/admin/system/TemplateController.java +++ b/contact-center/app/src/main/java/com/chatopera/cc/controller/admin/system/TemplateController.java @@ -67,7 +67,7 @@ public class TemplateController extends Handler{ @Menu(type = "admin" , subtype = "template" , access = false , admin = true) public void expall(ModelMap map , HttpServletRequest request , HttpServletResponse response) throws Exception { List