From 1e90af8dcad678ff7f881ea37d42dd1a73c5975b Mon Sep 17 00:00:00 2001
From: liyuchen <791867849@qq.com>
Date: Fri, 14 Apr 2023 18:28:48 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9chief=E7=AE=A1=E7=90=86?=
 =?UTF-8?q?=E5=91=98=E7=9A=84=E7=A7=9F=E6=88=B7=E6=9F=A5=E8=AF=A2-liyuchen?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/com/kening/vordm/entity/Administrator.java  |  2 ++
 .../vordm/controller/AdministratorController.java    | 12 +++++++++++-
 .../com/kening/vordm/mapper/AdministratorMapper.java |  7 +++++++
 .../com/kening/vordm/mapper/AdministratorMapper.xml  | 12 ++++++++++++
 .../vordm/service/impl/AdministratorServiceImpl.java |  5 ++++-
 5 files changed, 36 insertions(+), 2 deletions(-)

diff --git a/kn-service-api/biz-vordm-api/src/main/java/com/kening/vordm/entity/Administrator.java b/kn-service-api/biz-vordm-api/src/main/java/com/kening/vordm/entity/Administrator.java
index d746649..9695efd 100644
--- a/kn-service-api/biz-vordm-api/src/main/java/com/kening/vordm/entity/Administrator.java
+++ b/kn-service-api/biz-vordm-api/src/main/java/com/kening/vordm/entity/Administrator.java
@@ -1,6 +1,7 @@
 package com.kening.vordm.entity;
 
 import com.baomidou.mybatisplus.annotation.TableName;
+import com.fasterxml.jackson.annotation.JsonIgnore;
 import io.protostuff.runtime.ArraySchemas;
 import lombok.Data;
 import org.springblade.core.mp.base.BaseEntity;
@@ -26,6 +27,7 @@ public class Administrator extends BaseEntity {
 
 	private String account;
 
+	@JsonIgnore
 	private String password;
 
 	private String name;
diff --git a/kn-service/biz-vordm/src/main/java/com/kening/vordm/controller/AdministratorController.java b/kn-service/biz-vordm/src/main/java/com/kening/vordm/controller/AdministratorController.java
index ce10d20..ef7402b 100644
--- a/kn-service/biz-vordm/src/main/java/com/kening/vordm/controller/AdministratorController.java
+++ b/kn-service/biz-vordm/src/main/java/com/kening/vordm/controller/AdministratorController.java
@@ -50,6 +50,16 @@ public class AdministratorController {
 		return R.status(service.saveChiefAdmin(administrator));
 	}
 
+	/**
+	 * 更新管理员信息
+	 * @param administrator
+	 * @return
+	 */
+	@PutMapping("/update")
+	public R<Boolean> update(@RequestBody Administrator administrator){
+		return R.status(service.updateById(administrator));
+	}
+
 	/**
 	 * 删除管理员用户
 	 * @param ids
@@ -57,6 +67,6 @@ public class AdministratorController {
 	 */
 	@DeleteMapping("/delete")
 	public R<Boolean> delete(@RequestParam String ids){
-		return R.status(service.removeByIds(Func.toLongList(ids)));
+		return R.status(service.deleteLogic(Func.toLongList(ids)));
 	}
 }
diff --git a/kn-service/biz-vordm/src/main/java/com/kening/vordm/mapper/AdministratorMapper.java b/kn-service/biz-vordm/src/main/java/com/kening/vordm/mapper/AdministratorMapper.java
index 1149e49..22c044c 100644
--- a/kn-service/biz-vordm/src/main/java/com/kening/vordm/mapper/AdministratorMapper.java
+++ b/kn-service/biz-vordm/src/main/java/com/kening/vordm/mapper/AdministratorMapper.java
@@ -16,4 +16,11 @@ public interface AdministratorMapper extends BaseMapper<Administrator> {
 	 * @return
 	 */
 	Long getChiefRole(@Param("roleName") String roleName);
+
+	/**
+	 * 根据租户名称查询租户id
+	 * @param tenantName
+	 * @return
+	 */
+	String getChiefTenant(@Param("tenantName") String tenantName);
 }
diff --git a/kn-service/biz-vordm/src/main/java/com/kening/vordm/mapper/AdministratorMapper.xml b/kn-service/biz-vordm/src/main/java/com/kening/vordm/mapper/AdministratorMapper.xml
index 8f81ac3..9300ef8 100644
--- a/kn-service/biz-vordm/src/main/java/com/kening/vordm/mapper/AdministratorMapper.xml
+++ b/kn-service/biz-vordm/src/main/java/com/kening/vordm/mapper/AdministratorMapper.xml
@@ -15,4 +15,16 @@
                 </if>
             </where>
     </select>
+
+    <select id="getChiefTenant" resultType="java.lang.String">
+        select
+        tenant_id
+        from blade_tenant
+        <where>
+            and is_deleted = 0
+            <if test="tenantName!=null and tenantName!=''">
+                and tenant_name = #{tenantName}
+            </if>
+        </where>
+    </select>
 </mapper>
diff --git a/kn-service/biz-vordm/src/main/java/com/kening/vordm/service/impl/AdministratorServiceImpl.java b/kn-service/biz-vordm/src/main/java/com/kening/vordm/service/impl/AdministratorServiceImpl.java
index ccac219..1e5ef26 100644
--- a/kn-service/biz-vordm/src/main/java/com/kening/vordm/service/impl/AdministratorServiceImpl.java
+++ b/kn-service/biz-vordm/src/main/java/com/kening/vordm/service/impl/AdministratorServiceImpl.java
@@ -52,7 +52,8 @@ public class AdministratorServiceImpl extends BaseServiceImpl<AdministratorMappe
 		if(admin!=null){
 			throw new RuntimeException("The account has been registered");
 		}
-		administrator.setTenantId("595035");
+		String tenantId = baseMapper.getChiefTenant("VORDM");
+		administrator.setTenantId(tenantId);
 		administrator.setUserType(1);
 		administrator.setRealName(administrator.getName());
 		//密码默认为1234
@@ -60,6 +61,7 @@ public class AdministratorServiceImpl extends BaseServiceImpl<AdministratorMappe
 		//角色为chief
 		Long roleId = baseMapper.getChiefRole("chief");
 		administrator.setRoleId(String.valueOf(roleId));
+		//保存chief管理员信息
 		save(administrator);
 		try{
 			//设置标题
@@ -67,6 +69,7 @@ public class AdministratorServiceImpl extends BaseServiceImpl<AdministratorMappe
 			//设置要填充模板的参数
 			Map<String, Object> dataMap = new HashMap<>();
 			dataMap.put("account", administrator.getAccount());
+			//默认密码 1234
 			dataMap.put("password", "1234");
 			dataMap.put("time", LocalDate.now().format(DateTimeFormatter.ofPattern("yyyy/MM/dd")));
 			Email email = new Email();