From d911867560f251b5036facc3d57c0aeaf5864052 Mon Sep 17 00:00:00 2001
From: yanyan <evelyn_yanyan@sina.cn>
Date: Mon, 12 May 2025 14:54:52 +0800
Subject: [PATCH] =?UTF-8?q?=E8=A7=92=E8=89=B2=E6=A0=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../role/controller/RoleController.java       |  5 ++-
 .../system/role/service/RoleServiceImpl.java  |  5 ++-
 .../resources/mapper/system/UserMapper.xml    |  4 +-
 .../resources/templates/system/role/add.html  |  6 ++-
 .../templates/system/role/roleNew.html        | 40 ++++++++++---------
 5 files changed, 34 insertions(+), 26 deletions(-)

diff --git a/lib/EmergencyService/zdxtEmergencyAuthService/src/main/java/com/zdxt/auth/project/system/role/controller/RoleController.java b/lib/EmergencyService/zdxtEmergencyAuthService/src/main/java/com/zdxt/auth/project/system/role/controller/RoleController.java
index decdda60..655ad5b2 100644
--- a/lib/EmergencyService/zdxtEmergencyAuthService/src/main/java/com/zdxt/auth/project/system/role/controller/RoleController.java
+++ b/lib/EmergencyService/zdxtEmergencyAuthService/src/main/java/com/zdxt/auth/project/system/role/controller/RoleController.java
@@ -75,9 +75,10 @@ public class RoleController extends BaseController
     /**
      * 新增角色
      */
-    @GetMapping("/add")
-    public String add()
+    @GetMapping("/add/{deptId}")
+    public String add(@PathVariable("deptId") String deptId, ModelMap mmap)
     {
+        mmap.put("deptId", deptId);
         return prefix + "/add";
     }
 
diff --git a/lib/EmergencyService/zdxtEmergencyAuthService/src/main/java/com/zdxt/auth/project/system/role/service/RoleServiceImpl.java b/lib/EmergencyService/zdxtEmergencyAuthService/src/main/java/com/zdxt/auth/project/system/role/service/RoleServiceImpl.java
index 9edd44ce..a185be5d 100644
--- a/lib/EmergencyService/zdxtEmergencyAuthService/src/main/java/com/zdxt/auth/project/system/role/service/RoleServiceImpl.java
+++ b/lib/EmergencyService/zdxtEmergencyAuthService/src/main/java/com/zdxt/auth/project/system/role/service/RoleServiceImpl.java
@@ -15,6 +15,7 @@ import com.zdxt.common.Ztree;
 import com.zdxt.common.annotation.DataScope;
 
 import com.zdxt.domain.auth.*;
+import org.apache.commons.collections.CollectionUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
@@ -176,7 +177,9 @@ public class RoleServiceImpl implements IRoleService {
     public int insertRole(Role role) {
         role.setCreateBy(ShiroUtils.getLoginName());
         // 新增角色信息
-        role.setDeptId(userApi.getCurrentUser().getDeptId());
+        if (StringUtils.isEmpty(role.getDeptId())) {
+            role.setDeptId(userApi.getCurrentUser().getDeptId());
+        }
         role.setUserId(userApi.getCurrentUser().getUserId());
         roleMapper.insertRole(role);
         ShiroUtils.clearCachedAuthorizationInfo();
diff --git a/lib/EmergencyService/zdxtEmergencyAuthService/src/main/resources/mapper/system/UserMapper.xml b/lib/EmergencyService/zdxtEmergencyAuthService/src/main/resources/mapper/system/UserMapper.xml
index 569e98ac..3e227db0 100644
--- a/lib/EmergencyService/zdxtEmergencyAuthService/src/main/resources/mapper/system/UserMapper.xml
+++ b/lib/EmergencyService/zdxtEmergencyAuthService/src/main/resources/mapper/system/UserMapper.xml
@@ -199,8 +199,8 @@
         <if test="tenantCode != @com.zdxt.auth.common.constant.Constants@DEFAULT_TENANT_CODE and tenantCode != null and tenantCode != ''">
             AND u.tenant_code = #{tenantCode}
         </if>
-        AND  u.law_certificate_num is not null
-        AND  u.law_certificate_num !=""
+        <!--AND  u.law_certificate_num is not null
+        AND  u.law_certificate_num !="" -->
         <if test="params.dataScope != null and params.dataScope != ''">
             <!-- 数据范围过滤 -->
             ${params.dataScope}
diff --git a/lib/EmergencyService/zdxtEmergencyBootStart/src/main/resources/templates/system/role/add.html b/lib/EmergencyService/zdxtEmergencyBootStart/src/main/resources/templates/system/role/add.html
index b57c3000..f2e61b77 100644
--- a/lib/EmergencyService/zdxtEmergencyBootStart/src/main/resources/templates/system/role/add.html
+++ b/lib/EmergencyService/zdxtEmergencyBootStart/src/main/resources/templates/system/role/add.html
@@ -62,7 +62,7 @@
 	</div>
 	<th:block th:include="include :: footer" />
 	<th:block th:include="include :: ztree-js" />
-	<script type="text/javascript">
+	<script type="text/javascript" th:inline="javascript">
 	    $(function() {
 			/*var url = ctx + "system/menu/roleMenuTreeData";
 			var options = {
@@ -129,6 +129,7 @@
 	    }
 	
 		function add() {
+			var deptId = [[${deptId}]];
 			var roleName = $("input[name='roleName']").val();
 			var roleKey = $("input[name='roleKey']").val();
 			var roleSort = $("input[name='roleSort']").val();
@@ -149,7 +150,8 @@
 					"remark": remark,
 					"menuIds": null,
 					"roleCode":roleCode,
-					"isRoleSys":isRoleSys
+					"isRoleSys":isRoleSys,
+					"deptId": deptId
 					// "menuIds": menuIds
 				},
 				async : false,
diff --git a/lib/EmergencyService/zdxtEmergencyBootStart/src/main/resources/templates/system/role/roleNew.html b/lib/EmergencyService/zdxtEmergencyBootStart/src/main/resources/templates/system/role/roleNew.html
index fc725459..cb22742f 100644
--- a/lib/EmergencyService/zdxtEmergencyBootStart/src/main/resources/templates/system/role/roleNew.html
+++ b/lib/EmergencyService/zdxtEmergencyBootStart/src/main/resources/templates/system/role/roleNew.html
@@ -61,23 +61,20 @@
 					</form>
 				</div>
 
-		        <div class="btn-group-sm" id="toolbar" role="group">
-		        	<a class="btn btn-success" onclick="$.operate.add(100,1071,617)" shiro:hasPermission="system:user:add">
-		                <i class="fa fa-plus"></i> 新增
-		            </a>
-		             <!--<a class="btn btn-primary single disabled" onclick="$.operate.edit(null,1071,617)" shiro:hasPermission="system:user:edit">
-			            <i class="fa fa-edit"></i> 修改
-			        </a>-->
-		            <a class="btn btn-danger multiple disabled" onclick="$.operate.removeAll()" shiro:hasPermission="system:user:remove">
-		                <i class="fa fa-remove"></i> 全部删除
-		            </a>
-		            <!--<a class="btn btn-info" onclick="$.table.importExcel()" shiro:hasPermission="system:user:import">-->
-			            <!--<i class="fa fa-download"></i> 导入-->
-			        <!--</a>-->
-		            <!--<a class="btn btn-warning" onclick="$.table.exportExcel()" shiro:hasPermission="system:user:export">-->
-			            <!--<i class="fa fa-upload"></i> 导出-->
-			        <!--</a>-->
-		        </div>
+				<div class="btn-group-sm" id="toolbar" role="group">
+					<a class="btn btn-primary" onclick="add()" shiro:hasPermission="system:role:add">
+						<i class="fa fa-plus"></i> 新增
+					</a>
+					<a class="btn btn-success single disabled" onclick="$.operate.edit(null,814,381)" shiro:hasPermission="system:role:edit">
+						<i class="fa fa-edit"></i> 修改
+					</a>
+					<a class="btn btn-danger multiple disabled" onclick="$.operate.removeAll()" shiro:hasPermission="system:role:remove">
+						<i class="fa fa-remove"></i> 删除
+					</a>
+					<!--<a class="btn btn-warning" onclick="$.table.exportExcel()" shiro:hasPermission="system:role:export">
+                        <i class="fa fa-upload"></i> 导出
+                    </a>-->
+				</div>
 
 		        <div class="col-sm-12 select-table table-bordered">
 				    <table id="bootstrap-table"></table>
@@ -94,7 +91,7 @@
 		var editFlag = [[${@permission.hasPermi('system:role:edit')}]];
 		var removeFlag = [[${@permission.hasPermi('system:role:remove')}]];
 		var dictionaryFlag = [[${@permission.hasPermi('system:role:dictionary')}]];
-		var prefix = ctx + "system/user";
+		var prefix = ctx + "system/role";
 
 		$(function() {
 		    var panehHidden = false;
@@ -114,13 +111,18 @@
 		    queryDeptTree();
 		});
 
+		function add() {
+			var deptId = $("#deptId").val();
+			$.modal.open("新增角色", ctx + "system/role/add/" + deptId, 814,381);
+		}
+
 		function queryRoleList() {
 			var exportb = [[${@permission.hasPermi('system:role:export')}]];
 			var exportboolen = (exportb==""?true:false)
 
 			var options = {
 				url:  ctx + "system/role/list",
-				createUrl: prefix + "/add",
+				createUrl: prefix + "/add/{deptId}",
 				updateUrl: prefix + "/edit/{id}",
 				removeUrl: prefix + "/remove",
 				exportUrl: prefix + "/export",