From 529d8e179403e6bbb10884ee9f66a37c146e000b Mon Sep 17 00:00:00 2001
From: tamguo <tamguo@Lenovo>
Date: Wed, 1 Aug 2018 16:43:28 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../modules/sys/model/condition/SysUserCondition.java  |  7 +++++++
 .../tamguo/modules/sys/service/ISysUserService.java    |  4 ++++
 .../modules/sys/service/impl/SysUserServiceImpl.java   | 10 ++++++++++
 .../com/tamguo/modules/sys/web/SecAdminController.java |  5 +++--
 .../src/main/resources/mappers/sys/SysUserMapper.xml   |  4 ++++
 .../templates/modules/sys/corpAdmin/index.html         |  7 ++-----
 .../resources/templates/modules/sys/secAdmin/add.html  | 10 ++++++++--
 .../templates/modules/sys/secAdmin/index.html          |  1 +
 .../templates/modules/sys/user/dataScope.html          |  2 +-
 9 files changed, 40 insertions(+), 10 deletions(-)

diff --git a/tamguo-oms/src/main/java/com/tamguo/modules/sys/model/condition/SysUserCondition.java b/tamguo-oms/src/main/java/com/tamguo/modules/sys/model/condition/SysUserCondition.java
index 4299d6b..a87e171 100644
--- a/tamguo-oms/src/main/java/com/tamguo/modules/sys/model/condition/SysUserCondition.java
+++ b/tamguo-oms/src/main/java/com/tamguo/modules/sys/model/condition/SysUserCondition.java
@@ -18,6 +18,7 @@ public class SysUserCondition {
 	private String postCode;
 	private String status;
 	private String userType;
+	private String mgrType;
 	
 	private String orderBy;
 	
@@ -117,5 +118,11 @@ public class SysUserCondition {
 	public void setOrderBy(String orderBy) {
 		this.orderBy = orderBy;
 	}
+	public String getMgrType() {
+		return mgrType;
+	}
+	public void setMgrType(String mgrType) {
+		this.mgrType = mgrType;
+	}
 	
 }
diff --git a/tamguo-oms/src/main/java/com/tamguo/modules/sys/service/ISysUserService.java b/tamguo-oms/src/main/java/com/tamguo/modules/sys/service/ISysUserService.java
index 7df970f..abf47ee 100644
--- a/tamguo-oms/src/main/java/com/tamguo/modules/sys/service/ISysUserService.java
+++ b/tamguo-oms/src/main/java/com/tamguo/modules/sys/service/ISysUserService.java
@@ -8,6 +8,7 @@ import com.tamguo.modules.sys.model.SysUserDataScopeEntity;
 import com.tamguo.modules.sys.model.SysUserEntity;
 import com.tamguo.modules.sys.model.SysUserRoleEntity;
 import com.tamguo.modules.sys.model.condition.SysUserCondition;
+import com.tamguo.modules.sys.model.enums.SysUserMgrTypeEnum;
 import com.tamguo.modules.sys.utils.Result;
 
 public interface ISysUserService extends IService<SysUserEntity>{
@@ -39,6 +40,9 @@ public interface ISysUserService extends IService<SysUserEntity>{
 
 	/** 保存用户数据权限*/
 	public void saveUserDataScope(SysUserEntity user);
+	
+	/** 保存用户数据权限*/
+	public void saveUserDataScope(SysUserEntity user , SysUserMgrTypeEnum mgrType);
 
 	/** 停用账号*/
 	public Result disable(String userCode);
diff --git a/tamguo-oms/src/main/java/com/tamguo/modules/sys/service/impl/SysUserServiceImpl.java b/tamguo-oms/src/main/java/com/tamguo/modules/sys/service/impl/SysUserServiceImpl.java
index 2b9bb12..4a4f07e 100644
--- a/tamguo-oms/src/main/java/com/tamguo/modules/sys/service/impl/SysUserServiceImpl.java
+++ b/tamguo-oms/src/main/java/com/tamguo/modules/sys/service/impl/SysUserServiceImpl.java
@@ -233,4 +233,14 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUserEntity
 		return Result.result(0, null, "删除成功！");
 	}
 
+	@Transactional(readOnly=false)
+	@Override
+	public void saveUserDataScope(SysUserEntity user, SysUserMgrTypeEnum mgrType) {
+		this.saveUserDataScope(user);
+		
+		SysUserEntity entity = sysUserMapper.selectById(user.getUserCode());
+		entity.setMgrType(mgrType);
+		sysUserMapper.updateById(entity);
+	}
+
 }
diff --git a/tamguo-oms/src/main/java/com/tamguo/modules/sys/web/SecAdminController.java b/tamguo-oms/src/main/java/com/tamguo/modules/sys/web/SecAdminController.java
index c88e78d..e266c69 100644
--- a/tamguo-oms/src/main/java/com/tamguo/modules/sys/web/SecAdminController.java
+++ b/tamguo-oms/src/main/java/com/tamguo/modules/sys/web/SecAdminController.java
@@ -1,7 +1,6 @@
 package com.tamguo.modules.sys.web;
 
 import java.util.Map;
-
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Controller;
 import org.springframework.web.bind.annotation.RequestMapping;
@@ -12,6 +11,7 @@ import org.springframework.web.servlet.ModelAndView;
 import com.baomidou.mybatisplus.plugins.Page;
 import com.tamguo.modules.sys.model.SysUserEntity;
 import com.tamguo.modules.sys.model.condition.SysUserCondition;
+import com.tamguo.modules.sys.model.enums.SysUserMgrTypeEnum;
 import com.tamguo.modules.sys.service.ISysUserService;
 import com.tamguo.modules.sys.utils.Result;
 
@@ -34,13 +34,14 @@ public class SecAdminController {
 	public ModelAndView add(String userCode , ModelAndView model) {
 		model.setViewName(SECADMIN_ADD_PAGE);
 		model.addObject("user", iSysUserService.selectById(userCode));
+		model.addObject("userDataScopeList", iSysUserService.selectUserDataScope(userCode));
 		return model;
 	}
 	
 	@RequestMapping(path="save")
 	@ResponseBody
 	public Result save(SysUserEntity user , ModelAndView model) {
-		iSysUserService.saveUserDataScope(user);
+		iSysUserService.saveUserDataScope(user , SysUserMgrTypeEnum.SEC_ADMIN);
 		return Result.result(0, null, "【"+user.getUserName()+"】保存数据权限成功！"); 
 	}
 	
diff --git a/tamguo-oms/src/main/resources/mappers/sys/SysUserMapper.xml b/tamguo-oms/src/main/resources/mappers/sys/SysUserMapper.xml
index 383a8fc..005df51 100644
--- a/tamguo-oms/src/main/resources/mappers/sys/SysUserMapper.xml
+++ b/tamguo-oms/src/main/resources/mappers/sys/SysUserMapper.xml
@@ -62,6 +62,10 @@
 		<if test="userType != null and userType != ''">
 			and u.user_type = #{userType}
 		</if>
+		<if test="mgrType != null and mgrType != ''">
+			and u.mgr_Type = #{mgrType}
+		</if>
+		
 		<if test="orderBy != null and orderBy != ''">
 			order by ${orderBy}
 		</if>
diff --git a/tamguo-oms/src/main/resources/templates/modules/sys/corpAdmin/index.html b/tamguo-oms/src/main/resources/templates/modules/sys/corpAdmin/index.html
index 13655ab..b9d4459 100644
--- a/tamguo-oms/src/main/resources/templates/modules/sys/corpAdmin/index.html
+++ b/tamguo-oms/src/main/resources/templates/modules/sys/corpAdmin/index.html
@@ -25,11 +25,12 @@ content="width=device-width, initial-scale=1, user-scalable=1" name="viewport"/>
 			</div>
 			<div class="box-tools pull-right">
 				<a href="#" class="btn btn-default" id="btnSearch" title="查询"><i class="fa fa-filter"></i> 查询</a>
-					<a href="/js/a/sys/corpAdmin/form?op=addCorp" class="btn btn-default btnTool" title="新增租户管理员"><i class="fa fa-plus"></i> 新增租户管理员</a>
+					<a href="sys/corpAdmin/add?op=addCorp" class="btn btn-default btnTool" title="新增管理员"><i class="fa fa-plus"></i> 新增管理员</a>
 			</div>
 		</div>
 		<div class="box-body">
 <form id="searchForm" th:action="${setting.domain + 'sys/corpAdmin/listData'}" method="post" class="form-inline " data-page-no="1" data-page-size="10" data-order-by="">
+<input type="hidden" name="mgrType" id="mgrType" value="1"></input>
 				<div class="form-group">
 					<label class="control-label">登录账号：</label>
 					<div class="control-inline">
@@ -94,10 +95,6 @@ $('#dataGrid').dataGrid({
 			return '<a href="/js/a/sys/corpAdmin/form?userCode='+row.userCode+'&op=edit" class="btnList" data-title="编辑用户">'+(val||row.id)+'</a>';
 		}},
 		{header:'用户昵称', name:'userName', index:'a.user_name', width:200, align:"center"},
-		{header:'租户代码', name:'corpCode_', index:'a.corp_code', width:200, align:"center", formatter: function(val, obj, row, act){
-			return '<a href="javascript:" onclick="$(\'#corpCode_\').val(\''+val+'\');$(\'#searchForm\').submit()">'+val+'</a>';
-		}},
-		{header:'租户名称', name:'corpName_', index:'a.corp_name', width:200, align:"center"},
 		{header:'电子邮箱', name:'email', index:'a.email', width:200, align:"center"},
 		{header:'手机号码', name:'mobile', index:'a.mobile', width:200, align:"center"},
 		{header:'办公电话', name:'phone', index:'a.phone', width:200, align:"center"},
diff --git a/tamguo-oms/src/main/resources/templates/modules/sys/secAdmin/add.html b/tamguo-oms/src/main/resources/templates/modules/sys/secAdmin/add.html
index 1f6c433..93163b0 100644
--- a/tamguo-oms/src/main/resources/templates/modules/sys/secAdmin/add.html
+++ b/tamguo-oms/src/main/resources/templates/modules/sys/secAdmin/add.html
@@ -28,7 +28,7 @@ content="width=device-width, initial-scale=1, user-scalable=1" name="viewport"/>
 			</div>
 		</div>
 <form id="inputForm" th:action="${setting.domain + 'sys/secAdmin/save'}" method="post" class="form-horizontal">
-<input type="hidden" id="userCode" name="userCode" value="TEST_y6ee"/>
+<input type="hidden" id="userCode" name="userCode" th:value="${user.userCode}"/>
 			<div class="box-body"><br/>
 				<div class="row">
 					<div class="col-xs-6">
@@ -101,7 +101,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){
 		// 获取数据权限数据
@@ -239,4 +239,10 @@ for (var i=0; i<dataScopes.length; i++){
 	});
 }
 // 默认选择节点
+var userDataScopeList = [[${userDataScopeList}]];
+for(var i=0 ; i<userDataScopeList.length ; i++){
+	try{
+		dataScopeTrees[userDataScopeList[i].ctrlType].checkNode(dataScopeTrees[userDataScopeList[i].ctrlType].getNodeByParam("id",userDataScopeList[i].ctrlData), true, false);
+	}catch(e){}
+}
 </script>
\ No newline at end of file
diff --git a/tamguo-oms/src/main/resources/templates/modules/sys/secAdmin/index.html b/tamguo-oms/src/main/resources/templates/modules/sys/secAdmin/index.html
index 1db5b98..da35707 100644
--- a/tamguo-oms/src/main/resources/templates/modules/sys/secAdmin/index.html
+++ b/tamguo-oms/src/main/resources/templates/modules/sys/secAdmin/index.html
@@ -30,6 +30,7 @@ content="width=device-width, initial-scale=1, user-scalable=1" name="viewport"/>
 		</div>
 		<div class="box-body">
 <form id="searchForm" th:action="${setting.domain + 'sys/secAdmin/listData'}" method="post" class="form-inline " data-page-no="1" data-page-size="10" data-order-by="">
+<input type="hidden" name="mgrType" id="mgrType" value="2"></input>
 				<div class="form-group">
 					<label class="control-label">账号：</label>
 					<div class="control-inline">
diff --git a/tamguo-oms/src/main/resources/templates/modules/sys/user/dataScope.html b/tamguo-oms/src/main/resources/templates/modules/sys/user/dataScope.html
index a185b6e..dd3c9b1 100644
--- a/tamguo-oms/src/main/resources/templates/modules/sys/user/dataScope.html
+++ b/tamguo-oms/src/main/resources/templates/modules/sys/user/dataScope.html
@@ -101,7 +101,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){
 		// 获取数据权限数据