From f327e75e15f52fb407e1a9b45176bcc5efd6f78b Mon Sep 17 00:00:00 2001
From: tamguo <tamguo@Lenovo>
Date: Thu, 26 Jul 2018 11:54:15 +0800
Subject: [PATCH] =?UTF-8?q?=E6=95=B0=E6=8D=AE=E6=9D=83=E9=99=90?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../modules/sys/model/SysRoleEntity.java      | 10 +++++++
 .../modules/sys/service/ISysRoleService.java  |  3 +++
 .../sys/service/impl/SysRoleServiceImpl.java  | 27 ++++++++++++++++++-
 .../modules/sys/web/SysRoleController.java    |  8 ++++++
 .../templates/modules/sys/role/dataScope.html | 18 ++++++-------
 5 files changed, 56 insertions(+), 10 deletions(-)

diff --git a/tamguo-oms/src/main/java/com/tamguo/modules/sys/model/SysRoleEntity.java b/tamguo-oms/src/main/java/com/tamguo/modules/sys/model/SysRoleEntity.java
index a421556..ef4013d 100644
--- a/tamguo-oms/src/main/java/com/tamguo/modules/sys/model/SysRoleEntity.java
+++ b/tamguo-oms/src/main/java/com/tamguo/modules/sys/model/SysRoleEntity.java
@@ -36,6 +36,8 @@ public class SysRoleEntity implements Serializable {
 	
 	@TableField(exist=false)
 	private String roleMenuListJson;
+	@TableField(exist=false)
+	private String roleDataScopeListJson;
 
 	public SysRoleEntity() {
 	}
@@ -172,4 +174,12 @@ public class SysRoleEntity implements Serializable {
 		this.roleMenuListJson = roleMenuListJson;
 	}
 
+	public String getRoleDataScopeListJson() {
+		return roleDataScopeListJson;
+	}
+
+	public void setRoleDataScopeListJson(String roleDataScopeListJson) {
+		this.roleDataScopeListJson = roleDataScopeListJson;
+	}
+
 }
\ No newline at end of file
diff --git a/tamguo-oms/src/main/java/com/tamguo/modules/sys/service/ISysRoleService.java b/tamguo-oms/src/main/java/com/tamguo/modules/sys/service/ISysRoleService.java
index f37916c..0d958c3 100644
--- a/tamguo-oms/src/main/java/com/tamguo/modules/sys/service/ISysRoleService.java
+++ b/tamguo-oms/src/main/java/com/tamguo/modules/sys/service/ISysRoleService.java
@@ -18,4 +18,7 @@ public interface ISysRoleService extends IService<SysRoleEntity>{
 	/** 分配功能权限*/
 	void allowMenuPermission(SysRoleEntity role);
 
+	/** 授权数据权限*/
+	void allowDataScope(SysRoleEntity role);
+
 }
diff --git a/tamguo-oms/src/main/java/com/tamguo/modules/sys/service/impl/SysRoleServiceImpl.java b/tamguo-oms/src/main/java/com/tamguo/modules/sys/service/impl/SysRoleServiceImpl.java
index e4fd726..f55580a 100644
--- a/tamguo-oms/src/main/java/com/tamguo/modules/sys/service/impl/SysRoleServiceImpl.java
+++ b/tamguo-oms/src/main/java/com/tamguo/modules/sys/service/impl/SysRoleServiceImpl.java
@@ -14,9 +14,11 @@ import com.baomidou.mybatisplus.mapper.Condition;
 import com.baomidou.mybatisplus.plugins.Page;
 import com.baomidou.mybatisplus.service.impl.ServiceImpl;
 import com.tamguo.modules.sys.dao.SysMenuMapper;
+import com.tamguo.modules.sys.dao.SysRoleDataScopeMapper;
 import com.tamguo.modules.sys.dao.SysRoleMapper;
 import com.tamguo.modules.sys.dao.SysRoleMenuMapper;
 import com.tamguo.modules.sys.model.SysMenuEntity;
+import com.tamguo.modules.sys.model.SysRoleDataScopeEntity;
 import com.tamguo.modules.sys.model.SysRoleEntity;
 import com.tamguo.modules.sys.model.SysRoleMenuEntity;
 import com.tamguo.modules.sys.model.condition.SysRoleCondition;
@@ -31,6 +33,8 @@ public class SysRoleServiceImpl extends ServiceImpl<SysRoleMapper, SysRoleEntity
 	private SysMenuMapper sysMenuMapper;
 	@Autowired
 	private SysRoleMenuMapper sysRoleMenuMapper;
+	@Autowired
+	private SysRoleDataScopeMapper sysRoleDataScopeMapper;
 
 	@Transactional(readOnly=true)
 	@Override
@@ -82,7 +86,7 @@ public class SysRoleServiceImpl extends ServiceImpl<SysRoleMapper, SysRoleEntity
 	@SuppressWarnings("unchecked")
 	@Override
 	public void allowMenuPermission(SysRoleEntity role) {
-		// 先删除关联表数据
+		// 删除关联菜单
 		sysRoleMenuMapper.delete(Condition.create().eq("role_code", role.getRoleCode()));
 		
 		if(!StringUtils.isEmpty(role.getRoleMenuListJson())) {
@@ -96,4 +100,25 @@ public class SysRoleServiceImpl extends ServiceImpl<SysRoleMapper, SysRoleEntity
 			}
 		}
 	}
+
+	@SuppressWarnings("unchecked")
+	@Override
+	public void allowDataScope(SysRoleEntity role) {
+		// 删除权限
+		sysRoleDataScopeMapper.delete(Condition.create().eq("role_code", role.getRoleCode()));
+		
+		// 插入权限
+		if(!StringUtils.isEmpty(role.getRoleDataScopeListJson())) {
+			JSONArray roleDataScopes = JSONArray.parseArray(role.getRoleDataScopeListJson());
+			for(int i=0 ; i<roleDataScopes.size() ; i++) {
+				JSONObject dataScope = roleDataScopes.getJSONObject(i);
+				SysRoleDataScopeEntity roleDataScope = new SysRoleDataScopeEntity();
+				roleDataScope.setRoleCode(role.getRoleCode());
+				roleDataScope.setCtrlPermi("1");
+				roleDataScope.setCtrlType(dataScope.getString("ctrlType"));
+				roleDataScope.setCtrlData(dataScope.getString("ctrlData"));
+				sysRoleDataScopeMapper.insert(roleDataScope);
+			}
+		}
+	}
 }
diff --git a/tamguo-oms/src/main/java/com/tamguo/modules/sys/web/SysRoleController.java b/tamguo-oms/src/main/java/com/tamguo/modules/sys/web/SysRoleController.java
index 3b7b676..d032263 100644
--- a/tamguo-oms/src/main/java/com/tamguo/modules/sys/web/SysRoleController.java
+++ b/tamguo-oms/src/main/java/com/tamguo/modules/sys/web/SysRoleController.java
@@ -78,4 +78,12 @@ public class SysRoleController {
 		return Result.result(0, null, "保存角色【"+role.getRoleName()+"】成功！");
 	}
 	
+	/** 数据权限 */
+	@RequestMapping(path="allowDataScope",method=RequestMethod.POST)
+	@ResponseBody
+	public Result allowDataScope(SysRoleEntity role) {
+		iSysRoleService.allowDataScope(role);
+		return Result.result(0, null, "保存角色【"+role.getRoleName()+"】成功！");
+	}
+	
 }
diff --git a/tamguo-oms/src/main/resources/templates/modules/sys/role/dataScope.html b/tamguo-oms/src/main/resources/templates/modules/sys/role/dataScope.html
index 2ab17e9..62188a5 100644
--- a/tamguo-oms/src/main/resources/templates/modules/sys/role/dataScope.html
+++ b/tamguo-oms/src/main/resources/templates/modules/sys/role/dataScope.html
@@ -27,7 +27,7 @@ content="width=device-width, initial-scale=1, user-scalable=1" name="viewport"/>
 				<button type="button" class="btn btn-box-tool" data-widget="collapse"><i class="fa fa-minus"></i></button>
 			</div>
 		</div>
-<form id="inputForm" action="sys/role/saveDataScope" method="post" class="form-horizontal">
+<form id="inputForm" th:action="${setting.domain + 'sys/role/allowDataScope'}" method="post" class="form-horizontal">
 			<div class="box-body"><br/>
 				<div class="row">
 					<div class="col-xs-6">
@@ -118,7 +118,7 @@ content="width=device-width, initial-scale=1, user-scalable=1" name="viewport"/>
 <script th:src="${setting.domain + 'common/jeesite.js'}"></script>
 <script th:src="${setting.domain + 'common/i18n/jeesite_zh_CN.js'}"></script>
 <script th:src="${setting.domain + 'common/common.js'}"></script>
-<script>
+<script type="text/javascript" th:inline="javascript">
 $("#inputForm").validate({
 	submitHandler: function(form){
 		// 获取数据权限数据
@@ -135,7 +135,7 @@ $("#inputForm").validate({
 		// 提交表单数据
 		js.ajaxSubmitForm($(form), function(data){
 			js.showMessage(data.message);
-			if(data.result == Global.TRUE){
+			if(data.code == 0){
 				js.closeCurrentTabPage(function(contentWindow){
 					contentWindow.page();
 				});
@@ -258,10 +258,10 @@ for (var i=0; i<dataScopes.length; i++){
 	});
 }
 // 默认选择节点
-try{
-	dataScopeTrees['Company'].checkNode(dataScopeTrees['Company'].getNodeByParam("id","SD1"), true, false);
-}catch(e){}
-try{
-	dataScopeTrees['Company'].checkNode(dataScopeTrees['Company'].getNodeByParam("id","SD2"), true, false);
-}catch(e){}
+var roleDataScopeList = [[${roleDataScopeList}]];
+for(var i=0 ; i<roleDataScopeList.length ; i++){
+	try{
+		dataScopeTrees[roleDataScopeList[i].ctrlType].checkNode(dataScopeTrees[roleDataScopeList[i].ctrlType].getNodeByParam("id",roleDataScopeList[i].ctrlData), true, false);
+	}catch(e){}
+}
 </script>
\ No newline at end of file