q792602257/FrameTour-BE
0
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

修改完善CRUD

Browse Source
This commit is contained in:
longbinbin
2024-11-29 11:39:42 +08:00
parent abf7bf9bda
commit 33b7cd630c
7 changed files with 38 additions and 56 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
src/main/java/com/ycwl/basic/model/pc/adminUser/resp/AdminUserListRespVO.java
View File

@ -9,18 +9,20 @@ import lombok.Data;
public class AdminUserListRespVO {
@ApiModelProperty(value = "id")
private String id;
@ApiModelProperty(value = "员工ID")
private String staffId;
@ApiModelProperty(value = "员工姓名")
private String staffName;
@ApiModelProperty(value = "昵称")
private String name;
// @ApiModelProperty(value = "员工ID")
// private String staffId;
// @ApiModelProperty(value = "员工姓名")
// private String staffName;
@ApiModelProperty(value = "手机号")
private String phone;
@ApiModelProperty(value = "工号")
private String jobNo;
@ApiModelProperty(value = "组织")
private String companyName;
@ApiModelProperty(value = "组织ID")
private String companyId;
// @ApiModelProperty(value = "工号")
// private String jobNo;
// @ApiModelProperty(value = "组织")
// private String companyName;
// @ApiModelProperty(value = "组织ID")
// private String companyId;
@ApiModelProperty(value = "角色")
private String roleName;
@ApiModelProperty(value = "角色ID")

4
src/main/java/com/ycwl/basic/model/pc/role/req/AddOrUpdateRoleReqVO.java
View File

@ -11,8 +11,8 @@ public class AddOrUpdateRoleReqVO {
private String id;
@ApiModelProperty(value = "角色名称")
private String name;
@ApiModelProperty(value = "0系统角色 1业务角色")
private Integer type;
// @ApiModelProperty(value = "0系统角色 1业务角色")
// private Integer type;
@ApiModelProperty(value = "菜单ID列表")
private List<Integer> menuIdList;

4
src/main/java/com/ycwl/basic/model/pc/role/req/RoleListReqVO.java
View File

@ -10,6 +10,6 @@ import lombok.Data;
public class RoleListReqVO extends BaseQueryParameterReq {
@ApiModelProperty(value = "名字")
private String name;
@ApiModelProperty(value = "0系统角色 1业务角色")
private Integer type;
// @ApiModelProperty(value = "0系统角色 1业务角色")
// private Integer type;
}

4
src/main/java/com/ycwl/basic/service/impl/pc/AdminUserServiceImpl.java
View File

@ -60,8 +60,8 @@ public class AdminUserServiceImpl implements AdminUserService {
String id = addOrUpdateAdminUserReqVO.getId();
if (StringUtils.isBlank(id)) {
addOrUpdateAdminUserReqVO.setId(SnowFlakeUtil.getId());
String password = addOrUpdateAdminUserReqVO.getPassword();
addOrUpdateAdminUserReqVO.setPassword(password);
// String password = addOrUpdateAdminUserReqVO.getPassword();
// addOrUpdateAdminUserReqVO.setPassword(password);
int add = adminUserMapper.add(addOrUpdateAdminUserReqVO);
if (add > 0) {
return ApiResponse.buildSuccessResponse(null);

10
src/main/java/com/ycwl/basic/service/impl/pc/RoleServiceImpl.java
View File

@ -37,9 +37,9 @@ public class RoleServiceImpl implements RoleService {
@Override
public ApiResponse list(RoleListReqVO roleListReqVO) {
PageHelper.startPage(roleListReqVO.getPage(),roleListReqVO.getPageSize());
if(roleListReqVO.getType()==null){
roleListReqVO.setType(0);
}
// if(roleListReqVO.getType()==null){
// roleListReqVO.setType(0);
// }
List<RoleListRespVO> list = roleMapper.list(roleListReqVO);
PageInfo<RoleListRespVO> pageInfo = new PageInfo(list);
return ApiResponse.buildSuccessResponse(pageInfo);
@ -52,7 +52,9 @@ public class RoleServiceImpl implements RoleService {
String roleId = SnowFlakeUtil.getId();
addOrUpdateRoleReqVO.setId(roleId);
if(roleMapper.add(addOrUpdateRoleReqVO)>0){
menuMapper.addRoleMenu(roleId,addOrUpdateRoleReqVO.getMenuIdList());
if(addOrUpdateRoleReqVO.getMenuIdList()!=null&addOrUpdateRoleReqVO.getMenuIdList().size()>0) {
menuMapper.addRoleMenu(roleId, addOrUpdateRoleReqVO.getMenuIdList());
}
return ApiResponse.buildSuccessResponse(null);
}
}else {