合并产品【9229】权限组分配用户页签，选择了组织，权限分配时只是分配给所选组织，没有分配给子组织

applications/dee-perm/src/views/roleManagement/AssignPermissions.vue

@@ -26,7 +26,7 @@
           <el-form
             ref="newForm1"
             :model="form1"
-            label-width="100px"
+            label-width="120px"
           >
             <el-form-item label="选择组:">
               <OrgLazyLoadSelect
@@ -37,6 +37,9 @@
                 style="width: 100%;"
               />
             </el-form-item>
+            <el-form-item label="包含子组织用户:">
+              <el-checkbox v-model="cascadeSubOrg" />
+            </el-form-item>
             <el-form-item label="选择群组:">
               <dee-group
                 v-model="userGroupcheckeds"
@@ -46,6 +49,9 @@
                 style="width: 100%;"
               />
             </el-form-item>
+            <el-form-item label="包含子群组用户:">
+              <el-checkbox v-model="cascadeSubGroup" />
+            </el-form-item>
             <el-form-item label="选择用户:">
               <el-select
                 v-model="users"
@@ -292,11 +298,13 @@ export default {
       grouBlen: false,
       // groups: [],
       groupcheckeds: [],
+      cascadeSubOrg: false,
       currentRow: {},
       groupRemoteOptions: [],
       reGroupRemoteOptions: [],
       reUserGroupRemoteOptions: [],
       userGroupcheckeds: [],
+      cascadeSubGroup: false,
       // 授权部门
       authOrgIds: [],
       authOrgVisible: false,
@@ -1448,7 +1456,8 @@ export default {
           roleId: this.userInfo.id,
           userGroupId: m.id,
           userGroupType: 'GROUP',
-          name: m.name
+          name: m.name,
+          cascadeSubOrg: this.cascadeSubOrg
         })
       })
       this.userGroupcheckeds.forEach(m => {
@@ -1456,10 +1465,10 @@ export default {
           roleId: this.userInfo.id,
           userGroupId: m.id,
           userGroupType: 'TEAM',
-          name: m.name
+          name: m.name,
+          cascadeSubGroup: this.cascadeSubGroup
         })
       })
-      console.log(this.users)
       this.users.forEach(el => {
         userGroups.push({
           userGroupType: 'USER',