Merge branch 'master' into yyhouc
This commit is contained in:
commit
47b3a1f7b0
|
@ -17,4 +17,8 @@ public class HotspotArea {
|
|||
* 频次
|
||||
*/
|
||||
private Integer value;
|
||||
/**
|
||||
* 名称
|
||||
*/
|
||||
private String nameNew;
|
||||
}
|
||||
|
|
|
@ -49,7 +49,7 @@ public class Websites implements Serializable {
|
|||
/**
|
||||
* 网站灾害对应id
|
||||
*/
|
||||
private Long websiteId;
|
||||
private String websiteId;
|
||||
|
||||
/**
|
||||
* 上传的管理人员
|
||||
|
|
|
@ -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>
|
||||
|
|
|
@ -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);
|
||||
|
|
Loading…
Reference in New Issue