From 2cdbc8a386bb4d5e2171332ef238b8dbf15859a8 Mon Sep 17 00:00:00 2001
From: Hai Liang Wang <hailiang.hl.wang@gmail.com>
Date: Fri, 7 Sep 2018 16:26:02 +0800
Subject: [PATCH] =?UTF-8?q?#61=20=E6=92=A4=E9=94=80=E9=83=A8=E9=97=A8?=
 =?UTF-8?q?=E6=8E=88=E6=9D=83=E5=8A=9F=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../cc/webim/web/handler/Handler.java         |  2 -
 .../cc/webim/web/handler/LoginController.java | 14 +----
 .../handler/admin/organ/OrganController.java  | 21 +------
 .../resources/templates/admin/organ/auth.html | 60 -------------------
 .../templates/admin/organ/index.html          |  3 -
 5 files changed, 3 insertions(+), 97 deletions(-)
 delete mode 100644 contact-center/app/src/main/resources/templates/admin/organ/auth.html

diff --git a/contact-center/app/src/main/java/com/chatopera/cc/webim/web/handler/Handler.java b/contact-center/app/src/main/java/com/chatopera/cc/webim/web/handler/Handler.java
index a4d47a5f..7b821e5f 100644
--- a/contact-center/app/src/main/java/com/chatopera/cc/webim/web/handler/Handler.java
+++ b/contact-center/app/src/main/java/com/chatopera/cc/webim/web/handler/Handler.java
@@ -253,8 +253,6 @@ public class Handler {
 		return user ;
 	}
 	
-	
-	
 	public void setUser(HttpServletRequest request , User user){
 		request.getSession(true).removeAttribute(UKDataContext.USER_SESSION_NAME) ;
 		request.getSession(true).setAttribute(UKDataContext.USER_SESSION_NAME , user) ;
diff --git a/contact-center/app/src/main/java/com/chatopera/cc/webim/web/handler/LoginController.java b/contact-center/app/src/main/java/com/chatopera/cc/webim/web/handler/LoginController.java
index 1122654e..baab5376 100644
--- a/contact-center/app/src/main/java/com/chatopera/cc/webim/web/handler/LoginController.java
+++ b/contact-center/app/src/main/java/com/chatopera/cc/webim/web/handler/LoginController.java
@@ -179,18 +179,8 @@ public class LoginController extends Handler{
 	    			loginUser.getRoleList().add(userRole.getRole()) ;
 	    		}
 	    	}
-	    	if(!StringUtils.isBlank(loginUser.getOrgan())){
-	    		Organ organ = organRepository.findByIdAndOrgi(loginUser.getOrgan(), loginUser.getOrgi()) ;
-	    		if(organ!=null){
-	    			List<OrganRole> organRoleList = organRoleRes.findByOrgiAndOrgan(loginUser.getOrgi(), organ) ;
-	    			if(organRoleList.size() > 0){
-	    				for(OrganRole organRole : organRoleList){
-	    					loginUser.getRoleAuthMap().put(organRole.getDicvalue(),true);
-	    				}
-	    			}
-	    		}
-	    	}
-	    	//获取用户的授权资源
+
+	    	//获取用户的角色权限，进行授权
 	    	List<RoleAuth> roleAuthList = roleAuthRes.findAll(new Specification<RoleAuth>(){
 	    		@Override
 	    		public Predicate toPredicate(Root<RoleAuth> root, CriteriaQuery<?> query,
diff --git a/contact-center/app/src/main/java/com/chatopera/cc/webim/web/handler/admin/organ/OrganController.java b/contact-center/app/src/main/java/com/chatopera/cc/webim/web/handler/admin/organ/OrganController.java
index c89bf1c4..94b11b97 100644
--- a/contact-center/app/src/main/java/com/chatopera/cc/webim/web/handler/admin/organ/OrganController.java
+++ b/contact-center/app/src/main/java/com/chatopera/cc/webim/web/handler/admin/organ/OrganController.java
@@ -316,26 +316,7 @@ public class OrganController extends Handler{
     	}
     	return request(super.createRequestPageTempletResponse("redirect:/admin/organ/index.html?msg="+msg));
     }
-    
-    @RequestMapping("/auth")
-    @Menu(type = "admin" , subtype = "organ")
-    public ModelAndView auth(ModelMap map ,HttpServletRequest request , @Valid String id) {
-    	
-    	SysDic sysDic = sysDicRes.findByCode(UKDataContext.UKEFU_SYSTEM_AUTH_DIC) ;
-    	if(sysDic!=null){
-    		map.addAttribute("resourceList", sysDicRes.findByDicid(sysDic.getId())) ;
-    	}
-    	
-    	map.addAttribute("sysDic", sysDic) ;
-    	Organ organData = organRepository.findByIdAndOrgi(id, super.getOrgiByTenantshare(request)) ;
-    	map.addAttribute("organData", organData) ;
-    	map.addAttribute("roleList", roleRepository.findByOrgiAndOrgid(super.getOrgiByTenantshare(request),super.getOrgid(request))) ;
-    	
-    	map.addAttribute("organRoleList", organRoleRes.findByOrgiAndOrgan(super.getOrgiByTenantshare(request), organData)) ;
-    	
-        return request(super.createRequestPageTempletResponse("/admin/organ/auth"));
-    }
-    
+
     @RequestMapping("/auth/save")
     @Menu(type = "admin" , subtype = "role")
     public ModelAndView authsave(HttpServletRequest request ,@Valid String id ,@Valid String menus) {
diff --git a/contact-center/app/src/main/resources/templates/admin/organ/auth.html b/contact-center/app/src/main/resources/templates/admin/organ/auth.html
deleted file mode 100644
index c8debd7c..00000000
--- a/contact-center/app/src/main/resources/templates/admin/organ/auth.html
+++ /dev/null
@@ -1,60 +0,0 @@
-<div class="uk-layui-form">
-	<form class="layui-form uk-form" action="/admin/organ/auth/save.html">
-		<input type="hidden" name="id" value="${organData.id!''}">
-		<input type="hidden" name="menus" id="menus" value="<#if organRoleList??><#list organRoleList as organRole><#if organRole_index gt 0>,</#if>${organRole.dicid!''}</#list></#if>">
-		<div class="layui-form-item">
-			<div class="layui-input-inline">
-				<ul id="organTree" class="ztree"></ul>
-			</div>
-		</div>
-		<div class="layui-form-button">
-			<div class="layui-button-block">
-				<button class="layui-btn" lay-submit lay-filter="formDemo">立即提交</button>
-				<button type="reset" class="layui-btn layui-btn-primary">重置</button>
-			</div>
-		</div>
-	</form>
-</div>
-<SCRIPT type="text/javascript">
-		var setting = {
-			check: {
-				enable: true
-			},
-			data: {
-				simpleData: {
-					enable: true
-				}
-			},
-			callback: {
-				onCheck: zTreeOnCheck
-			}
-		};
-		
-		//获取所有选中节点的值
-	    function zTreeOnCheck() {
-	        var treeObj = $.fn.zTree.getZTreeObj("organTree");
-	        var nodes = treeObj.getCheckedNodes(true);
-	        var msg = "";
-	        for (var i = 0; i < nodes.length; i++) {
-	        	if(msg!='' && nodes[i].id != ''){
-					msg = msg+"," ;	        		
-	        	}
-	            msg += nodes[i].id;
-	        }
-	        $("#menus").val(msg);
-	    }    
-
-
-		var zNodes =[
-		    <#if sysDic??>{ id:'${sysDic.id!''}', pId:'0', name:"菜单资源", open:true , value : ""}</#if>
-		    <#if resourceList??>
-		    <#list resourceList as dic>
-			,{ id:'${dic.id}', pId:'${dic.parentid!''}' <#if organRoleList??><#list organRoleList as organRole><#if organRole.dicid?? && organRole.dicid == dic.id>,checked:true</#if></#list></#if> , name:"${dic.name!''}" , value : "${dic.code!''}", open:true , icon : "<#if dic.level?? && (dic.level == '1' || dic.level == '2')>/images/dir.png<#else>/images/menu.png</#if>"}
-			</#list>
-			</#if>
-		];
-		
-		$(document).ready(function(){
-			$.fn.zTree.init($("#organTree"), setting, zNodes);
-		});
-	</SCRIPT>
\ No newline at end of file
diff --git a/contact-center/app/src/main/resources/templates/admin/organ/index.html b/contact-center/app/src/main/resources/templates/admin/organ/index.html
index b8519291..f34c1975 100644
--- a/contact-center/app/src/main/resources/templates/admin/organ/index.html
+++ b/contact-center/app/src/main/resources/templates/admin/organ/index.html
@@ -31,9 +31,6 @@
 				<button class="layui-btn layui-btn-danger layui-btn-small" href="/admin/organ/delete.html?id=${organData.id!''}" data-toggle="tip" data-title="请确认是否删除该部门？">
 					删除部门
 				</button>
-				<button class="layui-btn layui-btn-danger layui-btn-small" href="/admin/organ/auth.html?id=${organData.id!''}" data-toggle="ajax" title="给机构授权角色" data-width="400" data-height="450">
-					部门授权
-				</button>
 				</#if>
 			</span>
 		</h1>