Explorar o código

qxm-修改是否存在tuc权限

qxm %!s(int64=3) %!d(string=hai) anos
pai
achega
1760f75ff5

+ 15 - 0
suishenbang-admin/src/main/resources/static/ruoyi/js/ry-ui.js

@@ -1226,6 +1226,7 @@
         		    var treeNode = nodeList[i];
         		    $.tree.showChildren(treeNode);
         		    $.tree.showParent(treeNode)
+        		    $.tree.notAllowParents(treeNode)
         		}
         	},
         	// 获取当前被勾选集合
@@ -1236,6 +1237,20 @@
         	        return row[_column];
         	    }).join();
         	},
+			// 获取当前被勾选集合
+			getCheckedNodesRole: function(column) {
+				var _column = $.common.isEmpty(column) ? "id" : column;
+				var nodes = $._tree.getCheckedNodes(true);
+				// console.log($._tree.getNodes()[0].getCheckStatus())
+				// console.log(nodes)
+				return $.map(nodes, function (row) {
+					if ($._tree.getNodes()[0].getCheckStatus().half==true && row.code=='A01'){
+						return
+					}else{
+						return row[_column];
+					}
+				}).join();
+			},
         	// 不允许根父节点选择
         	notAllowParents: function(_tree) {
     		    var nodes = _tree.getSelectedNodes();

+ 10 - 3
suishenbang-admin/src/main/resources/templates/system/user/author.html

@@ -25,8 +25,12 @@
 			var options = {
 				id: "menuTrees",
 		        url: url,
-		        check: { enable: true },
-		        expandLevel: 0
+		        check: { enable: true},
+		        expandLevel: 0,
+				onCheck:function (event,treeId,treeNode) {
+					// console.log(treeNode);
+					// console.log(treeNode.getParentNode());
+				}
 		    };
 			$.tree.init(options);
 		});
@@ -87,7 +91,10 @@
 
 		function edit() {
 			var userId = $("input[name='userId']").val();
-			var authorIds = $.tree.getCheckedNodes();
+			// console.log($.tree)
+			// console.log($.tree.getNodes()[0].getCheckStatus())
+
+			var authorIds = $.tree.getCheckedNodesRole();
 			$.ajax({
 				cache : true,
 				type : "POST",

+ 3 - 3
suishenbang-admin/src/main/resources/templates/system/user/user.html

@@ -251,10 +251,10 @@
 					width: "180px",
 		            formatter: function(value, row, index) {
 		                var actions = [];
-		                actions.push('<a class="btn btn-success btn-xs ' + authorFlag + '" href="javascript:void(0)" onclick="authorTree(\'' + row.userId + '\')"><i class="fa fa-edit"></i>权限</a> ');
 		                actions.push('<a class="btn btn-success btn-xs ' + editFlag + '" href="javascript:void(0)" onclick="$.operate.editTab(\'' + row.userId + '\')"><i class="fa fa-edit"></i>编辑</a> ');
-		                actions.push('<a class="btn btn-danger btn-xs ' + removeFlag + '" href="javascript:void(0)" onclick="$.operate.remove(\'' + row.userId + '\')"><i class="fa fa-remove"></i>删除</a> ');
-		                actions.push('<a class="btn btn-info btn-xs ' + resetPwdFlag + '" href="javascript:void(0)" onclick="resetPwd(\'' + row.userId + '\')"><i class="fa fa-key"></i>重置</a>');
+						actions.push('<a class="btn btn-success btn-xs ' + authorFlag + '" href="javascript:void(0)" onclick="authorTree(\'' + row.userId + '\')"><i class="fa fa-edit"></i>权限</a> ');
+						actions.push('<a class="btn btn-danger btn-xs ' + removeFlag + '" href="javascript:void(0)" onclick="$.operate.remove(\'' + row.userId + '\')"><i class="fa fa-remove"></i>删除</a> ');
+						actions.push('<a class="btn btn-info btn-xs ' + resetPwdFlag + '" href="javascript:void(0)" onclick="resetPwd(\'' + row.userId + '\')"><i class="fa fa-key"></i>重置</a>');
 
 
 		                return actions.join('');

+ 23 - 0
suishenbang-api/src/main/java/com/dgtly/api/controller/SysUserController.java

@@ -21,6 +21,7 @@ import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
 import java.util.List;
+import java.util.concurrent.TimeUnit;
 
 @Api(tags = "系统用户相关API")
 @RestController
@@ -127,6 +128,28 @@ public class SysUserController extends ApiBaseController {
         return AjaxResult.success().putKV("sysUser",user);
     }
 
+    @ApiOperation(value = "测试接口访问超时",
+            notes = "参数:{" +
+                    "waitingTime:int秒}")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "params" , paramType = "body")
+    })
+    @PostMapping("testAccessTimeout")
+    public Object testAccessTimeout() throws Exception{
+        ParameterObject obj =  getParameterObject();
+        obj.checkParameterNotNull("waitingTime");
+        String waitingTime =obj.getString("waitingTime");
+        int i = Integer.parseInt(waitingTime);
+        if (a<3) {
+            TimeUnit.SECONDS.sleep(i);//秒
+        }
+        a=a++;
+        System.out.println("访问次数");
+        return AjaxResult.success();
+    }
+
+    private int a=0;
+
     @ApiOperation(value = "获取销售员列表",
             notes = "参数:{" +
                     "bossEmployeeId:xxxxxx}")