Merge branch 'master' of http://42.193.1.25:9521/r/sccg_server

mg

2022-10-14 b9e7a0261443ca41b80108b9fef555093f20bb8b

 ycl-common/src/main/java/com/ycl/service/user/impl/UmsAdminServiceImpl.java

@@ -12,6 +12,7 @@
import com.ycl.dto.UpdateAdminPasswordParam;
import com.ycl.entity.depart.UmsDepart;
import com.ycl.entity.user.*;
import com.ycl.exception.ApiException;
import com.ycl.exception.Asserts;
import com.ycl.mapper.user.*;
import com.ycl.service.depart.UmsDepartService;
@@ -80,6 +81,8 @@
    UmsRoleMenuRelationMapper umsRoleMenuRelationMapper;
    @Resource
    AdminMenuRelationMapper adminMenuRelationMapper;
    @Resource
    UmsMenuMapper umsMenuMapper;

    @Override
    public UmsAdmin getAdminByUsername(String username) {
@@ -147,10 +150,11 @@
                    .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);
                    });
        }
@@ -407,4 +411,22 @@
        List<UmsAdmin> adminList = baseMapper.selectList(wrapperUser);
        return adminList;
    }

    @Override
    public String getTargetTo(String ids, String sendType) {
        String str = null;
        String[] arr = ids.split(",");
        QueryWrapper<UmsAdmin> wrapperUser = new QueryWrapper<>();
        wrapperUser.in("id", arr);
        List<UmsAdmin> adminList = baseMapper.selectList(wrapperUser);
        if (adminList == null || adminList.isEmpty()) {
            throw new ApiException("未查询到用户");
        }
        if ("02".equals(sendType)) {
            str = adminList.stream().map(UmsAdmin::getEmail).collect(Collectors.joining(","));
        } else {
            str = adminList.stream().map(UmsAdmin::getMobile).collect(Collectors.joining(","));
        }
        return str;
    }
}