From 165f68b0ed91f300beb404bbc968ce270ac9ecad Mon Sep 17 00:00:00 2001
From: lihongjie0209 <lihongjie0209@gmail.com>
Date: Mon, 13 Nov 2023 21:48:12 +0800
Subject: [PATCH] =?UTF-8?q?=E5=AE=8C=E5=96=84?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../coal/organization/service/OrganizationService.java        | 4 ++++
 src/main/java/cn/lihongjie/coal/user/dto/CreateUserDto.java   | 3 +++
 src/main/java/cn/lihongjie/coal/user/dto/UpdateUserDto.java   | 3 +++
 src/main/java/cn/lihongjie/coal/user/dto/UserDto.java         | 4 ++++
 4 files changed, 14 insertions(+)

diff --git a/src/main/java/cn/lihongjie/coal/organization/service/OrganizationService.java b/src/main/java/cn/lihongjie/coal/organization/service/OrganizationService.java
index 4b1a80e6..63178c02 100644
--- a/src/main/java/cn/lihongjie/coal/organization/service/OrganizationService.java
+++ b/src/main/java/cn/lihongjie/coal/organization/service/OrganizationService.java
@@ -3,6 +3,7 @@ package cn.lihongjie.coal.organization.service;
 import cn.lihongjie.coal.base.dto.CommonQuery;
 import cn.lihongjie.coal.base.dto.IdRequest;
 import cn.lihongjie.coal.base.service.BaseService;
+import cn.lihongjie.coal.coalParameterDef.service.CoalParameterDefService;
 import cn.lihongjie.coal.organization.dto.CreateOrganizationDto;
 import cn.lihongjie.coal.organization.dto.OrganizationDto;
 import cn.lihongjie.coal.organization.dto.UpdateOrganizationDto;
@@ -34,6 +35,8 @@ public class OrganizationService extends BaseService<OrganizationEntity, Organiz
 
     @Autowired UserService userService;
 
+    @Autowired CoalParameterDefService coalParameterDefService;
+
     @PostConstruct
     public void init() {}
 
@@ -48,6 +51,7 @@ public class OrganizationService extends BaseService<OrganizationEntity, Organiz
         dto.setUsername(request.getOrgAdminUserName());
         dto.setPassword(request.getOrgAdminPassword());
         userService.createOrgAdmin(dto);
+        coalParameterDefService.initDefault(entity.getId());
 
         return getById(entity.getId());
     }
diff --git a/src/main/java/cn/lihongjie/coal/user/dto/CreateUserDto.java b/src/main/java/cn/lihongjie/coal/user/dto/CreateUserDto.java
index 8461c198..6ab88210 100644
--- a/src/main/java/cn/lihongjie/coal/user/dto/CreateUserDto.java
+++ b/src/main/java/cn/lihongjie/coal/user/dto/CreateUserDto.java
@@ -23,5 +23,8 @@ public class CreateUserDto extends OrgCommonDto {
     @Comment("手机号")
     private String phone;
 
+    @Comment("机构管理员标识")
+    private Boolean orgAdmin;
+
     private List<String> roles;
 }
diff --git a/src/main/java/cn/lihongjie/coal/user/dto/UpdateUserDto.java b/src/main/java/cn/lihongjie/coal/user/dto/UpdateUserDto.java
index 6b4634e5..aff2c28a 100644
--- a/src/main/java/cn/lihongjie/coal/user/dto/UpdateUserDto.java
+++ b/src/main/java/cn/lihongjie/coal/user/dto/UpdateUserDto.java
@@ -17,5 +17,8 @@ public class UpdateUserDto extends OrgCommonDto {
     @Comment("手机号")
     private String phone;
 
+    @Comment("机构管理员标识")
+    private Boolean orgAdmin;
+
     private List<String> roles;
 }
diff --git a/src/main/java/cn/lihongjie/coal/user/dto/UserDto.java b/src/main/java/cn/lihongjie/coal/user/dto/UserDto.java
index 0f7c3402..3ff21088 100644
--- a/src/main/java/cn/lihongjie/coal/user/dto/UserDto.java
+++ b/src/main/java/cn/lihongjie/coal/user/dto/UserDto.java
@@ -21,6 +21,10 @@ public class UserDto extends OrgCommonDto {
 
     @Comment("会话ID")
     private String sessionId;
+
+    @Comment("机构管理员标识")
+    private Boolean orgAdmin;
+
     private List<RoleDto> roles;
     private List<RoleDto> otherRoles;