【拓扑配置】将角色权限删除保存后数据依然生效

@@ -112,7 +112,7 @@ layui.define(['form', 'admin', 'layer', 'common', 'sessions', 'xmSelect', 'resli
                 if (res && res.data.length > 0) {
                     var datas=[];
                     $.each(res.data,function (i,v) {
-                        datas.push({name: v.name, value: v.id});
+                        datas.push({name: `${v.name}(${v.code})` , value: v.id,code:v.code,roleName:v.name});
                     })
                     xmSelectRoles = xmSelect.render({
                         el: '#jgraph_roleIds',
@@ -173,12 +173,23 @@ layui.define(['form', 'admin', 'layer', 'common', 'sessions', 'xmSelect', 'resli
                 }
                 //获取Roles值
                 var topoRoles = [];
+                var isExistAdmin = false;
                 var selectedRoles = xmSelectRoles.getValue();
                 if (selectedRoles != null && selectedRoles.length > 0) {
                     $.each(selectedRoles , function (i, v) {
-                        topoRoles.push(v.value + "#" + v.name);
+                        topoRoles.push(v.value + "#" + v.roleName);
+                        if(v.code == 'ADMIN'){
+                            isExistAdmin = true;
+                        }
                     });
                 }
+                // 必须要选管理员
+                if(!isExistAdmin){
+                    layer.msg('保存失败,角色必须包含当管理员权限（ADMIN）!', {icon: 2, time: 3000});
+                    return false;
+                }
+
+
                 var targetId = '';
                 var topoType = $("#jgraph-topo_type").val();//拓扑类型
                 if (topoType && topoType === '1') {//业务拓扑
@@ -301,4 +312,4 @@ layui.define(['form', 'admin', 'layer', 'common', 'sessions', 'xmSelect', 'resli
             }
         }
     });
-});
\ No newline at end of file
+});