修改bug

wl

2022-11-04 8ba5c432338b400eae32180d6ece584601d7947b

修改bug

 ycl-common/src/main/java/com/ycl/controller/user/UmsAdminController.java

@@ -4,6 +4,7 @@
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.ycl.annotation.LogSave;
import com.ycl.api.CommonResult;
import com.ycl.bo.AdminUserDetails;
import com.ycl.controller.BaseController;
import com.ycl.dto.UmsAdminLoginParam;
import com.ycl.dto.UmsAdminParam;
@@ -12,7 +13,7 @@
import com.ycl.entity.user.UmsRole;
import com.ycl.service.redis.RedisService;
import com.ycl.service.user.UmsAdminService;
import com.ycl.service.user.UmsRoleService;
import com.ycl.service.user.UmsMenuService;
import com.ycl.utils.redis.RedisKey;
import com.ycl.vo.user.UserVO;
import io.swagger.annotations.Api;
@@ -21,6 +22,7 @@
import io.swagger.annotations.ApiOperation;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.security.core.context.SecurityContextHolder;
import org.springframework.stereotype.Controller;
import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.*;
@@ -47,7 +49,7 @@
    @Autowired
    private UmsAdminService adminService;
    @Autowired
    private UmsRoleService roleService;
    UmsMenuService umsMenuService;
    @Resource
    private RedisService redisService;

@@ -101,13 +103,12 @@
        }
        String username = principal.getName();
        UmsAdmin umsAdmin = adminService.getAdminByUsername(username);
        AdminUserDetails user = (AdminUserDetails) SecurityContextHolder.getContext().getAuthentication().getPrincipal();
        Map<String, Object> data = new HashMap<>();
        data.put("userId", umsAdmin.getId());
        data.put("username", umsAdmin.getUsername());
        data.put("menus", roleService.getMenuList(umsAdmin.getId()));
        data.put("icon", umsAdmin.getIcon());
        data.put("user", umsAdmin);
        data.put("menus", umsMenuService.ListTreeMyself(user.getUserId()));
        List<UmsRole> roleList = adminService.getRoleList(umsAdmin.getId());
        if (CollUtil.isNotEmpty(roleList)) {    
        if (CollUtil.isNotEmpty(roleList)) {
            List<String> roles = roleList.stream().map(UmsRole::getName).collect(Collectors.toList());
            data.put("roles", roles);
        }

 ycl-common/src/main/resources/mapper/user/UmsAdminMapper.xml

@@ -65,7 +65,7 @@
            ud.STATUS depart_status,
            ud.is_deleted,
            ur.id role_id,
            ur.id NAME,
            ur.name NAME,
            ur.description,
            ur.admin_count,
            ur.create_time role_create_time,