blame | 历史 | 补丁 | 提交 | 提交对比 | ignore whitespace
guoyuji
2024-05-23 ef5a518c3e2c1fe41aa60f56ca31ddafa0cb1561 
 north-glass-erp/src/main/java/com/example/erp/service/userInfo/UserService.java


@@ -8,10 +8,7 @@


import com.example.erp.entity.userInfo.PermissionBasic;


import com.example.erp.entity.userInfo.Role;


import com.example.erp.entity.userInfo.User;


import com.example.erp.mapper.userInfo.PermissionBasicMapper;


import com.example.erp.mapper.userInfo.PermissionRoleMapper;


import com.example.erp.mapper.userInfo.RoleMapper;


import com.example.erp.mapper.userInfo.UserMapper;


import com.example.erp.mapper.userInfo.*;


import com.example.erp.tools.TokenTools;


import org.springframework.beans.factory.annotation.Autowired;


import org.springframework.cache.annotation.CacheEvict;


@@ -30,13 +27,15 @@




    private final UserMapper userMapper;


    private final RoleMapper roleMapper;


    private final UserRoleMapper userRoleMapper;




   private final PermissionRoleMapper permissionRoleMapper;




    public UserService(UserMapper userMapper, RoleMapper roleMapper, PermissionRoleMapper permissionRoleMapper) {


    public UserService(UserMapper userMapper, RoleMapper roleMapper, PermissionRoleMapper permissionRoleMapper, UserRoleMapper userRoleMapper) {


        this.userMapper = userMapper;


        this.roleMapper = roleMapper;


        this.permissionRoleMapper = permissionRoleMapper;


        this.userRoleMapper = userRoleMapper;


    }






@@ -94,7 +93,8 @@


            userDTO.setId(user.getId());


            userDTO.setUserName(user.getUserName());


            userDTO.setToken(StpUtil.getTokenValue());


            userDTO.setPermissions(permissionRoleMapper.getUserEditPermission(user.getId()));


            Boolean userIsAdmin= userRoleMapper.getUserIsAdmin(user.getId());


            userDTO.setPermissions(permissionRoleMapper.getUserEditPermission(user.getId(),userIsAdmin));


            return userDTO;


        }else{


            return null;