From 2aa7699ed76e9b024a2af823ec38a2613bcaad93 Mon Sep 17 00:00:00 2001
From: Gitea <gitea@fake.local>
Date: Sun, 10 Nov 2024 19:20:52 +0800
Subject: [PATCH] =?UTF-8?q?=E5=88=9B=E6=96=B0=E5=88=B8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/impl/SysDepartServiceImpl.java    |  3 +-
 .../projectApplication/project/Project.api.ts | 30 ++++++++++++++++
 .../system/usersetting/UserSetting.data.ts    | 34 +++++++++----------
 3 files changed, 49 insertions(+), 18 deletions(-)

diff --git a/jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/service/impl/SysDepartServiceImpl.java b/jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/service/impl/SysDepartServiceImpl.java
index 44a6bd7..8426230 100644
--- a/jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/service/impl/SysDepartServiceImpl.java
+++ b/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);
diff --git a/jeecgboot-vue3/src/views/projectApplication/project/Project.api.ts b/jeecgboot-vue3/src/views/projectApplication/project/Project.api.ts
index 09be436..25c93ad 100644
--- a/jeecgboot-vue3/src/views/projectApplication/project/Project.api.ts
+++ b/jeecgboot-vue3/src/views/projectApplication/project/Project.api.ts
@@ -5,14 +5,22 @@ const {createConfirm} = useMessage();
 
 enum Api {
   list = '/project/project/list',
+  projectType = '/projectType/getProjectTypeList',
+  departDtoInfo = '/project/project/getDepartDtoInfo',
   save = '/project/project/add',
   edit = '/project/project/edit',
   deleteOne = '/project/project/delete',
+  submitOne = '/project/project/submitApply',
+  rollbackOne = '/project/project/rollbackProject',
   deleteBatch = '/project/project/deleteBatch',
   importExcel = '/project/project/importExcel',
   exportXls = '/project/project/exportXls',
 }
 
+export const getDepartDtoByProjectId = (params) =>
+  defHttp.get({url: Api.departDtoInfo, params});
+
+
 /**
  * 导出api
  * @param params
@@ -29,6 +37,14 @@ export const getImportUrl = Api.importExcel;
 export const list = (params) =>
   defHttp.get({url: Api.list, params});
 
+
+export const getProjectTypeList = (params) =>
+  defHttp.get({url: Api.projectType, params});
+
+
+export const getDepartBaseInfo = (params) =>
+  defHttp.get({url: Api.departBaseInfo, params});
+
 /**
  * 删除单个
  */
@@ -37,6 +53,20 @@ export const deleteOne = (params, handleSuccess) => {
     handleSuccess();
   });
 }
+
+export const submitOne = (params, handleSuccess) => {
+  return defHttp.post({url: Api.submitOne, params}, {joinParamsToUrl: true}).then(() => {
+    handleSuccess();
+  });
+}
+
+export const rollbackOne = (params, handleSuccess) => {
+  return defHttp.post({url: Api.rollbackOne, params}, {joinParamsToUrl: true}).then(() => {
+    handleSuccess();
+  });
+}
+
+
 /**
  * 批量删除
  * @param params
diff --git a/jeecgboot-vue3/src/views/system/usersetting/UserSetting.data.ts b/jeecgboot-vue3/src/views/system/usersetting/UserSetting.data.ts
index 896ab4d..c0ebbfe 100644
--- a/jeecgboot-vue3/src/views/system/usersetting/UserSetting.data.ts
+++ b/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',
@@ -39,7 +39,7 @@ export const settingList = [
     img1: zuhu1,
     img2: zuhu2,
   },*/
-   {
+  {
     key: '3',
     name: '账号安全',
     component: 'AccountSetting',
@@ -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',
-    component: 'JDictSelectTag',
-    label: '租户',
-    colProps: { span: 24 },
-    componentProps:{
-      mode:'multiple',
-      dictCode:'sys_tenant,name,id',
-      disabled:true
-    }
-  },
-  {
+  // {
+  //   field: 'relTenantIds',
+  //   component: 'JDictSelectTag',
+  //   label: '租户',
+  //   colProps: { span: 24 },
+  //   componentProps:{
+  //     mode:'multiple',
+  //     dictCode:'sys_tenant,name,id',
+  //     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',