mg
2022-10-20 81656aa3aba8f8b383898a6ae3dd1e4b3b68512e
ycl-common/src/main/java/com/ycl/service/user/impl/UmsAdminServiceImpl.java
@@ -25,7 +25,6 @@
import com.ycl.utils.common.LiveTimeMillisecond;
import com.ycl.utils.common.MacUtils;
import com.ycl.utils.common.PojoUtils;
import com.ycl.utils.common.RandomUtils;
import com.ycl.utils.redis.RedisKey;
import com.ycl.vo.user.UserVO;
import org.apache.commons.lang3.StringUtils;
@@ -81,6 +80,8 @@
    UmsRoleMenuRelationMapper umsRoleMenuRelationMapper;
    @Resource
    AdminMenuRelationMapper adminMenuRelationMapper;
    @Resource
    UmsMenuMapper umsMenuMapper;
    @Override
    public UmsAdmin getAdminByUsername(String username) {
@@ -148,15 +149,16 @@
                    .selectList(new LambdaQueryWrapper<UmsRoleMenuRelation>()
                            .eq(UmsRoleMenuRelation::getRoleId, maxId))
                    .stream()
                    .forEach(item->{
                    .forEach(item -> {
                        AdminMenuRelation adminMenuRelation = new AdminMenuRelation();
                        adminMenuRelation.setAdminId(umsAdmin.getId());
                        adminMenuRelation.setMenuId(item.getMenuId());
                        adminMenuRelation.setSort(umsMenuMapper.selectOne(new LambdaQueryWrapper<UmsMenu>().eq(UmsMenu::getId, item.getMenuId())).getSort());
                        adminMenuRelationMapper.insert(adminMenuRelation);
                    });
        }
        //对用户名系统默认添加
        umsAdmin.setNickName(RandomUtils.getUserId(umsAdmin.getId()));
        //umsAdmin.setNickName(RandomUtils.getUserId(umsAdmin.getId()));
        baseMapper.updateById(umsAdmin);
        return umsAdmin;
@@ -416,11 +418,11 @@
        QueryWrapper<UmsAdmin> wrapperUser = new QueryWrapper<>();
        wrapperUser.in("id", arr);
        List<UmsAdmin> adminList = baseMapper.selectList(wrapperUser);
        if (adminList == null||adminList.isEmpty()) {
        if (adminList == null || adminList.isEmpty()) {
            throw new ApiException("未查询到用户");
        }
        if ("02".equals(sendType)) {
           str = adminList.stream().map(UmsAdmin::getEmail).collect(Collectors.joining(","));
            str = adminList.stream().map(UmsAdmin::getEmail).collect(Collectors.joining(","));
        } else {
            str = adminList.stream().map(UmsAdmin::getMobile).collect(Collectors.joining(","));
        }