Merge branch 'master' of http://182.92.169.222:3000/chaodf0105/zmd_cxq

jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/service/impl/SysDepartServiceImpl.java

@@ -212,7 +212,8 @@ public class SysDepartServiceImpl extends ServiceImpl<SysDepartMapper, SysDepart
 					sysDepart.setOrgCategory("1");
 				} else {
 					//sysDepart.setOrgCategory("2");原来设置为2，暂时设置3
-					sysDepart.setOrgCategory("3");
+					sysDepart.setOrgCategory(departMapper.getDepartById(parentId).getOrgCategory());
+
 				}
 			}
 			this.save(sysDepart);

jeecgboot-vue3/src/views/system/usersetting/UserSetting.data.ts

@@ -30,7 +30,7 @@ export const settingList = [
     img1: geren1,
     img2: geren2,
   },
-/*  {
+  /*{
     key: '2',
     name: '我的组织',
     component: 'TenantSetting',
@@ -47,7 +47,7 @@ export const settingList = [
     img1: anquan1,
     img2: anquan2,
   },
-/*  {
+  /*{
     key: '4',
     name: '第三方APP',
     component: 'WeChatDingSetting',
@@ -98,18 +98,18 @@ export const formSchema: FormSchema[] = [
       ],
     }
   },
-  {
+  // {
-    field: 'relTenantIds',
+  //   field: 'relTenantIds',
-    component: 'JDictSelectTag',
+  //   component: 'JDictSelectTag',
-    label: '租户',
+  //   label: '租户',
-    colProps: { span: 24 },
+  //   colProps: { span: 24 },
-    componentProps:{
+  //   componentProps:{
-      mode:'multiple',
+  //     mode:'multiple',
-      dictCode:'sys_tenant,name,id',
+  //     dictCode:'sys_tenant,name,id',
-      disabled:true
+  //     disabled:true
-    }
+  //   }
-  },
+  // },
-  {
+/*  {
     field: 'post',
     component: 'JDictSelectTag',
     label: '职位',
@@ -117,9 +117,9 @@ export const formSchema: FormSchema[] = [
     componentProps:{
       mode:'multiple',
       dictCode:'sys_position,name,id',
-      disabled:true
+      disabled:false
     }
-  },
+  },*/
   {
     label: '',
     field: 'id',