廖井涛
19 小时以前 02a346b1b78c8d2b6b3c298ed2fb8feea8ef96ee
north-glass-erp/src/main/java/com/example/erp/service/userInfo/UserService.java
@@ -2,6 +2,8 @@
import cn.dev33.satoken.stp.StpUtil;
import cn.hutool.core.util.StrUtil;
import com.alibaba.fastjson.JSON;
import com.alibaba.fastjson.TypeReference;
import com.baomidou.dynamic.datasource.annotation.DS;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.example.erp.controller.dto.UserDTO;
@@ -143,7 +145,12 @@
            userDTO.setPass(null);
            userDTO.setId(user.getId());
            userDTO.setUserName(user.getUserName());
            userDTO.setAddress(user.getAddress());
             List<String> list = JSON.parseObject(user.getAddress(), new TypeReference<List<String>>() {});
            if(list!=null && list.size()==1){
                userDTO.setAddress(list.get(0));
            }else{
                userDTO.setAddress(list);
            }
            userDTO.setToken(StpUtil.getTokenValue());
            Boolean userIsAdmin= userRoleMapper.getUserIsAdmin(user.getId());
            userDTO.setPermissions(permissionRoleMapper.getUserEditPermission(user.getId(),userIsAdmin));