Merge branch 'master' into yyhouc

kn-service-api/biz-vordm-api/src/main/java/com/kening/vordm/entity/HotspotArea.java

@@ -17,4 +17,8 @@ public class HotspotArea {
 	 * 频次
 	 */
 	private Integer value;
+	/**
+	 * 名称
+	 */
+	private String nameNew;
 }

kn-service-api/biz-vordm-api/src/main/java/com/kening/vordm/entity/Websites.java

@@ -49,7 +49,7 @@ public class Websites implements Serializable {
     /**
      * 网站灾害对应id
      */
-    private Long websiteId;
+    private String websiteId;
 
     /**
      * 上传的管理人员

kn-service/biz-vordm/src/main/java/com/kening/vordm/mapper/HotspotMapper.xml

@@ -25,6 +25,7 @@
     <select id="hotspotCount" resultType="com.kening.vordm.entity.HotspotArea">
         select
                concat(area_cn,"(",area_en,")") as name,
+               area_en  AS nameNew,
                frequency as value
         from hotspot
         <where>

kn-service/biz-vordm/src/main/java/com/kening/vordm/service/impl/AdministratorServiceImpl.java

@@ -52,11 +52,16 @@ public class AdministratorServiceImpl extends BaseServiceImpl<AdministratorMappe
 	 */
 	@Override
 	public boolean saveChiefAdmin(Administrator administrator) {
+		Administrator adminNew = getOne(Wrappers.<Administrator>lambdaQuery().eq(Administrator::getEmail,administrator.getEmail()));
+		if(adminNew!=null){
+			throw new RuntimeException("The email has been registered");
+		}
 		//校验账号是否存在
 		Administrator admin = getOne(Wrappers.<Administrator>lambdaQuery().eq(Administrator::getAccount,administrator.getAccount()));
 		if(admin!=null){
 			throw new RuntimeException("The account has been registered");
 		}
+
 		String tenantId = baseMapper.getChiefTenant("VORDM");
 		administrator.setTenantId(tenantId);
 		administrator.setUserType(1);