功能完善

liuhaonan

2022-02-11 54cd0ca82059cdad4e9ee5b9b1c7164d443ab46f

 ximon-admin/src/main/java/com/sandu/ximon/admin/service/PoleGroupService.java

@@ -1,7 +1,9 @@
package com.sandu.ximon.admin.service;

import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.github.pagehelper.PageHelper;
import com.sandu.common.execption.BusinessException;
import com.sandu.common.object.BaseConditionVO;
import com.sandu.common.service.impl.BaseServiceImpl;
import com.sandu.ximon.admin.param.PoleGroupParam;
import com.sandu.ximon.admin.security.SecurityUtils;
@@ -25,7 +27,10 @@

    public boolean addGroup(PoleGroupParam param) {
        PoleGroup group = new PoleGroup();
        group.setClientId(SecurityUtils.getClientId());
        if(SecurityUtils.getClientId()!=null){
            group.setClientId(SecurityUtils.getUserId());
        }

        group.setGroupName(param.getGroupName());
        return save(group);
    }
@@ -49,12 +54,13 @@
        return removeById(groupId);
    }

    public List<PoleGroup> groupList() {
    public List<PoleGroup> groupList(BaseConditionVO baseConditionVO,String keyword) {
        Long clientId = SecurityUtils.getClientId();
        PageHelper.startPage(baseConditionVO.getPageNo(), baseConditionVO.getPageSize());
        if (clientId == null) {
            return list();
            return list(Wrappers.lambdaQuery(PoleGroup.class).like(PoleGroup::getGroupName,keyword));
        } else {
            return list(Wrappers.lambdaQuery(PoleGroup.class).eq(PoleGroup::getClientId, clientId));
            return list(Wrappers.lambdaQuery(PoleGroup.class).eq(PoleGroup::getClientId, clientId).like(PoleGroup::getGroupName,keyword));
        }
    }