Compare commits

..

8 Commits

Author SHA1 Message Date
3f8e3ea9ac 处理swagger每个接口类的名称 2025-08-06 17:44:41 +08:00
65b30e5e55 Merge remote-tracking branch 'origin/master' 2025-08-06 10:11:41 +08:00
0c4b1a659f 集团用户登陆,赋值组织机构id和名称全路径 2025-08-06 10:11:36 +08:00
cfc7808649 供应商登陆userType修改为2,(0是集团) 2025-08-05 09:39:03 +08:00
502f55deaf Merge remote-tracking branch 'origin/master' 2025-08-05 09:14:48 +08:00
3f1f5610d7 Merge remote-tracking branch 'origin/master' 2025-08-04 15:37:53 +08:00
8771e9c8da Merge remote-tracking branch 'origin/master'
# Conflicts:
#	src/main/java/com/coscoshipping/ebtp/system/category/maintenance/dao/mapper/CoscoCategoryMaintenanceMapper.xml
2025-08-04 08:32:13 +08:00
b1473a9b34 新增功能:更新所有数据的path和path_name字段,优化品类维护模块,支持路径信息的生成与更新。 2025-07-31 15:27:56 +08:00
6 changed files with 11 additions and 8 deletions

View File

@ -171,6 +171,9 @@ public class BaseUserServiceImpl extends BaseServiceImpl<BaseUserMapper, SysUser
baseCacheUser.setDeptName(sysOrg.getOrgName()); baseCacheUser.setDeptName(sysOrg.getOrgName());
baseCacheUser.setOrganizationId(sysOrg.getCuCompanyNumber()); baseCacheUser.setOrganizationId(sysOrg.getCuCompanyNumber());
baseCacheUser.setOrganizationName(sysOrg.getCuCompanyName()); baseCacheUser.setOrganizationName(sysOrg.getCuCompanyName());
// 组织机构id和名称全路径
baseCacheUser.setOrganizationFullId(sysOrg.getOrgFullId());
baseCacheUser.setOrganizationFullName(sysOrg.getOrgFullName());
baseCacheUser.setUserType("0"); baseCacheUser.setUserType("0");
baseCacheUser.setAuthorityList(authorityList); baseCacheUser.setAuthorityList(authorityList);
// 角色ID字符串拼接 // 角色ID字符串拼接
@ -295,7 +298,7 @@ public class BaseUserServiceImpl extends BaseServiceImpl<BaseUserMapper, SysUser
baseCacheUser.setOfficePhone(user.getMobile()); baseCacheUser.setOfficePhone(user.getMobile());
baseCacheUser.setSex(user.getSex() != null ? user.getSex().toString() : null); baseCacheUser.setSex(user.getSex() != null ? user.getSex().toString() : null);
baseCacheUser.setEmailAddress(user.getEmail()); baseCacheUser.setEmailAddress(user.getEmail());
baseCacheUser.setUserType("0"); baseCacheUser.setUserType("2");
baseCacheUser.setAuthorityList(authorityList); baseCacheUser.setAuthorityList(authorityList);
// 角色ID字符串拼接 // 角色ID字符串拼接
if (authorityList != null && !authorityList.isEmpty()) { if (authorityList != null && !authorityList.isEmpty()) {

View File

@ -21,7 +21,7 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.toolkit.Wrappers; import com.baomidou.mybatisplus.core.toolkit.Wrappers;
@RestController @RestController
@Api(value = "机构表") @Api(value = "机构表",tags = {"机构表"})
@RequestMapping("/v1/sysorg") @RequestMapping("/v1/sysorg")
public class SysOrgController{ public class SysOrgController{

View File

@ -23,7 +23,7 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.toolkit.Wrappers; import com.baomidou.mybatisplus.core.toolkit.Wrappers;
@RestController @RestController
@Api(value = "角色表") @Api(value = "角色表",tags = {"角色表"})
@RequestMapping("/v1/sysrole") @RequestMapping("/v1/sysrole")
public class SysRoleController{ public class SysRoleController{

View File

@ -18,7 +18,7 @@ import java.util.List;
@Slf4j @Slf4j
@RestController @RestController
@Api(value = "供应商用户管理") @Api(value = "供应商用户管理",tags = {"供应商用户管理"})
@RequestMapping("/v1/supplieruser") @RequestMapping("/v1/supplieruser")
public class SysSupplierUserController { public class SysSupplierUserController {

View File

@ -34,7 +34,7 @@ import org.springframework.http.ResponseEntity;
import java.io.IOException; import java.io.IOException;
@RestController @RestController
@Api(value = "门户用户表") @Api(value = "用户表",tags = {"用户表"})
@RequestMapping("/v1/sysuser") @RequestMapping("/v1/sysuser")
public class SysUserController { public class SysUserController {

View File

@ -21,7 +21,7 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.toolkit.Wrappers; import com.baomidou.mybatisplus.core.toolkit.Wrappers;
@RestController @RestController
@Api(value = "用户与角色关系表") @Api(value = "用户与角色关系表",tags = {"用户与角色关系表"})
@RequestMapping("/v1/sysuserrole") @RequestMapping("/v1/sysuserrole")
@Validated @Validated
public class SysUserRoleController{ public class SysUserRoleController{