diff --git a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/CustomerAgencyUserRoleDTO.java b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/CustomerAgencyUserRoleDTO.java index 562b5644a2..7ee6e68b2f 100644 --- a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/CustomerAgencyUserRoleDTO.java +++ b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/CustomerAgencyUserRoleDTO.java @@ -3,6 +3,7 @@ package com.epmet.dto; import lombok.Data; import java.io.Serializable; +import java.util.Map; /** * @Author zxc @@ -30,6 +31,6 @@ public class CustomerAgencyUserRoleDTO implements Serializable { /** * 角色 */ - private String roles; + private Map roles; } diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/CustomerStaffServiceImpl.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/CustomerStaffServiceImpl.java index 9f96ab8082..aea728c458 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/CustomerStaffServiceImpl.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/CustomerStaffServiceImpl.java @@ -339,7 +339,7 @@ public class CustomerStaffServiceImpl extends BaseServiceImpl { m.put(r.getRoleKey(),r.getRoleName()); }); - dto.setRoles(m.toString()); + dto.setRoles(m); staffRoleRedis.setRole(dto.getCustomerId(), dto.getStaffId(),dto); return new Result().ok(ConvertUtils.sourceToTarget(staffEntity, CustomerStaffDTO.class)); } @@ -412,7 +412,7 @@ public class CustomerStaffServiceImpl extends BaseServiceImpl { m.put(r.getRoleKey(),r.getRoleName()); }); - dto.setRoles(m.toString()); + dto.setRoles(m); staffRoleRedis.setRole(dto.getCustomerId(), dto.getStaffId(),dto); return new Result(); } diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/StaffRoleServiceImpl.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/StaffRoleServiceImpl.java index 0404a5ff0a..51f5e189b6 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/StaffRoleServiceImpl.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/StaffRoleServiceImpl.java @@ -17,6 +17,8 @@ package com.epmet.service.impl; +import com.alibaba.fastjson.JSON; +import com.alibaba.fastjson.JSONObject; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.epmet.commons.mybatis.entity.DataScope; @@ -228,7 +230,7 @@ public class StaffRoleServiceImpl extends BaseServiceImpl { map.put(l.getRoleKey(), l.getRoleName()); }); - dto.setRoles(map.toString()); + dto.setRoles(map); staffRoleRedis.setRole(customerId, staffId, dto); return dto; } @@ -259,7 +261,7 @@ public class StaffRoleServiceImpl extends BaseServiceImpl { map.put(l.getRoleKey(), l.getRoleName()); }); - dto.setRoles(map.toString()); + dto.setRoles(map); staffRoleRedis.setRole(customerId, userId, dto); }); }