修改chief管理员的租户查询-liyuchen
This commit is contained in:
parent
5abcf7ada1
commit
1e90af8dca
|
@ -1,6 +1,7 @@
|
||||||
package com.kening.vordm.entity;
|
package com.kening.vordm.entity;
|
||||||
|
|
||||||
import com.baomidou.mybatisplus.annotation.TableName;
|
import com.baomidou.mybatisplus.annotation.TableName;
|
||||||
|
import com.fasterxml.jackson.annotation.JsonIgnore;
|
||||||
import io.protostuff.runtime.ArraySchemas;
|
import io.protostuff.runtime.ArraySchemas;
|
||||||
import lombok.Data;
|
import lombok.Data;
|
||||||
import org.springblade.core.mp.base.BaseEntity;
|
import org.springblade.core.mp.base.BaseEntity;
|
||||||
|
@ -26,6 +27,7 @@ public class Administrator extends BaseEntity {
|
||||||
|
|
||||||
private String account;
|
private String account;
|
||||||
|
|
||||||
|
@JsonIgnore
|
||||||
private String password;
|
private String password;
|
||||||
|
|
||||||
private String name;
|
private String name;
|
||||||
|
|
|
@ -50,6 +50,16 @@ public class AdministratorController {
|
||||||
return R.status(service.saveChiefAdmin(administrator));
|
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
|
* @param ids
|
||||||
|
@ -57,6 +67,6 @@ public class AdministratorController {
|
||||||
*/
|
*/
|
||||||
@DeleteMapping("/delete")
|
@DeleteMapping("/delete")
|
||||||
public R<Boolean> delete(@RequestParam String ids){
|
public R<Boolean> delete(@RequestParam String ids){
|
||||||
return R.status(service.removeByIds(Func.toLongList(ids)));
|
return R.status(service.deleteLogic(Func.toLongList(ids)));
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -16,4 +16,11 @@ public interface AdministratorMapper extends BaseMapper<Administrator> {
|
||||||
* @return
|
* @return
|
||||||
*/
|
*/
|
||||||
Long getChiefRole(@Param("roleName") String roleName);
|
Long getChiefRole(@Param("roleName") String roleName);
|
||||||
|
|
||||||
|
/**
|
||||||
|
* 根据租户名称查询租户id
|
||||||
|
* @param tenantName
|
||||||
|
* @return
|
||||||
|
*/
|
||||||
|
String getChiefTenant(@Param("tenantName") String tenantName);
|
||||||
}
|
}
|
||||||
|
|
|
@ -15,4 +15,16 @@
|
||||||
</if>
|
</if>
|
||||||
</where>
|
</where>
|
||||||
</select>
|
</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>
|
</mapper>
|
||||||
|
|
|
@ -52,7 +52,8 @@ public class AdministratorServiceImpl extends BaseServiceImpl<AdministratorMappe
|
||||||
if(admin!=null){
|
if(admin!=null){
|
||||||
throw new RuntimeException("The account has been registered");
|
throw new RuntimeException("The account has been registered");
|
||||||
}
|
}
|
||||||
administrator.setTenantId("595035");
|
String tenantId = baseMapper.getChiefTenant("VORDM");
|
||||||
|
administrator.setTenantId(tenantId);
|
||||||
administrator.setUserType(1);
|
administrator.setUserType(1);
|
||||||
administrator.setRealName(administrator.getName());
|
administrator.setRealName(administrator.getName());
|
||||||
//密码默认为1234
|
//密码默认为1234
|
||||||
|
@ -60,6 +61,7 @@ public class AdministratorServiceImpl extends BaseServiceImpl<AdministratorMappe
|
||||||
//角色为chief
|
//角色为chief
|
||||||
Long roleId = baseMapper.getChiefRole("chief");
|
Long roleId = baseMapper.getChiefRole("chief");
|
||||||
administrator.setRoleId(String.valueOf(roleId));
|
administrator.setRoleId(String.valueOf(roleId));
|
||||||
|
//保存chief管理员信息
|
||||||
save(administrator);
|
save(administrator);
|
||||||
try{
|
try{
|
||||||
//设置标题
|
//设置标题
|
||||||
|
@ -67,6 +69,7 @@ public class AdministratorServiceImpl extends BaseServiceImpl<AdministratorMappe
|
||||||
//设置要填充模板的参数
|
//设置要填充模板的参数
|
||||||
Map<String, Object> dataMap = new HashMap<>();
|
Map<String, Object> dataMap = new HashMap<>();
|
||||||
dataMap.put("account", administrator.getAccount());
|
dataMap.put("account", administrator.getAccount());
|
||||||
|
//默认密码 1234
|
||||||
dataMap.put("password", "1234");
|
dataMap.put("password", "1234");
|
||||||
dataMap.put("time", LocalDate.now().format(DateTimeFormatter.ofPattern("yyyy/MM/dd")));
|
dataMap.put("time", LocalDate.now().format(DateTimeFormatter.ofPattern("yyyy/MM/dd")));
|
||||||
Email email = new Email();
|
Email email = new Email();
|
||||||
|
|
Loading…
Reference in New Issue