Compare commits
8 Commits
ce15d74146
...
master
Author | SHA1 | Date | |
---|---|---|---|
3f8e3ea9ac | |||
65b30e5e55 | |||
0c4b1a659f | |||
cfc7808649 | |||
502f55deaf | |||
3f1f5610d7 | |||
8771e9c8da | |||
b1473a9b34 |
@ -171,6 +171,9 @@ public class BaseUserServiceImpl extends BaseServiceImpl<BaseUserMapper, SysUser
|
||||
baseCacheUser.setDeptName(sysOrg.getOrgName());
|
||||
baseCacheUser.setOrganizationId(sysOrg.getCuCompanyNumber());
|
||||
baseCacheUser.setOrganizationName(sysOrg.getCuCompanyName());
|
||||
// 组织机构id和名称全路径
|
||||
baseCacheUser.setOrganizationFullId(sysOrg.getOrgFullId());
|
||||
baseCacheUser.setOrganizationFullName(sysOrg.getOrgFullName());
|
||||
baseCacheUser.setUserType("0");
|
||||
baseCacheUser.setAuthorityList(authorityList);
|
||||
// 角色ID字符串拼接
|
||||
@ -295,7 +298,7 @@ public class BaseUserServiceImpl extends BaseServiceImpl<BaseUserMapper, SysUser
|
||||
baseCacheUser.setOfficePhone(user.getMobile());
|
||||
baseCacheUser.setSex(user.getSex() != null ? user.getSex().toString() : null);
|
||||
baseCacheUser.setEmailAddress(user.getEmail());
|
||||
baseCacheUser.setUserType("0");
|
||||
baseCacheUser.setUserType("2");
|
||||
baseCacheUser.setAuthorityList(authorityList);
|
||||
// 角色ID字符串拼接
|
||||
if (authorityList != null && !authorityList.isEmpty()) {
|
||||
|
@ -21,7 +21,7 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
|
||||
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
|
||||
|
||||
@RestController
|
||||
@Api(value = "机构表")
|
||||
@Api(value = "机构表",tags = {"机构表"})
|
||||
@RequestMapping("/v1/sysorg")
|
||||
public class SysOrgController{
|
||||
|
||||
|
@ -23,7 +23,7 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
|
||||
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
|
||||
|
||||
@RestController
|
||||
@Api(value = "角色表")
|
||||
@Api(value = "角色表",tags = {"角色表"})
|
||||
@RequestMapping("/v1/sysrole")
|
||||
public class SysRoleController{
|
||||
|
||||
|
@ -18,7 +18,7 @@ import java.util.List;
|
||||
|
||||
@Slf4j
|
||||
@RestController
|
||||
@Api(value = "供应商用户管理")
|
||||
@Api(value = "供应商用户管理",tags = {"供应商用户管理"})
|
||||
@RequestMapping("/v1/supplieruser")
|
||||
public class SysSupplierUserController {
|
||||
|
||||
@ -36,7 +36,7 @@ public class SysSupplierUserController {
|
||||
public BaseResponse<SysSupplierUser> register(@ApiParam(value = "注册信息", required = true) @RequestBody @Valid SupplierRegistrationVO registrationVO) {
|
||||
try {
|
||||
SysSupplierUser supplierUser = sysSupplierUserService.createSupplierAccount(registrationVO);
|
||||
|
||||
|
||||
if (supplierUser != null) {
|
||||
log.info("供应商注册成功,供应商:{},登录名:{}", registrationVO.getSupplierName(), supplierUser.getUsername());
|
||||
return BaseResponse.success(supplierUser);
|
||||
@ -133,4 +133,4 @@ public class SysSupplierUserController {
|
||||
return BaseResponse.success(false);
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
@ -34,7 +34,7 @@ import org.springframework.http.ResponseEntity;
|
||||
import java.io.IOException;
|
||||
|
||||
@RestController
|
||||
@Api(value = "门户用户表")
|
||||
@Api(value = "用户表",tags = {"用户表"})
|
||||
@RequestMapping("/v1/sysuser")
|
||||
public class SysUserController {
|
||||
|
||||
|
@ -21,7 +21,7 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
|
||||
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
|
||||
|
||||
@RestController
|
||||
@Api(value = "用户与角色关系表")
|
||||
@Api(value = "用户与角色关系表",tags = {"用户与角色关系表"})
|
||||
@RequestMapping("/v1/sysuserrole")
|
||||
@Validated
|
||||
public class SysUserRoleController{
|
||||
|
Reference in New Issue
Block a user