linwei
2024-01-23 bff48e0801af8d8bdc8d73dce2a7b007e8af4235
添加网格员报错
1 files modified
14 ■■■■ changed files
src/main/java/org/springblade/modules/grid/service/impl/GridmanServiceImpl.java 14 ●●●● patch | view | raw | blame | history
src/main/java/org/springblade/modules/grid/service/impl/GridmanServiceImpl.java
@@ -18,12 +18,14 @@
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import org.apache.logging.log4j.util.Strings;
import org.flowable.idm.engine.impl.persistence.entity.UserEntity;
import org.springblade.common.cache.SysCache;
import org.springblade.core.secure.utils.AuthUtil;
import org.springblade.core.tool.utils.BeanUtil;
import org.springblade.core.tool.utils.SpringUtil;
import org.springblade.modules.grid.entity.GridEntity;
import org.springblade.modules.grid.entity.GridmanEntity;
import org.springblade.modules.grid.excel.GridmanExcel;
@@ -31,11 +33,7 @@
import org.springblade.modules.grid.service.IGridService;
import org.springblade.modules.grid.service.IGridmanService;
import org.springblade.modules.grid.vo.GridmanVO;
import org.springblade.modules.system.entity.Dept;
import org.springblade.modules.system.entity.Region;
import org.springblade.modules.system.entity.User;
import org.springblade.modules.system.service.IDeptService;
import org.springblade.modules.system.service.IRegionService;
import org.springblade.modules.system.service.IUserService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
@@ -70,6 +68,7 @@
    /**
     * 网格员表 自定义新增或修改
     *
     * @param gridman
     * @return
     */
@@ -88,6 +87,10 @@
            wrapper.eq("is_deleted", 0).eq("account", gridman.getMobile());
            List<User> list = userService.list(wrapper);
            // 更新用户,查询是否需要更新角色
            // 查询网格id
            IGridService bean = SpringUtil.getBean(IGridService.class);
            GridEntity gridEntity = bean.getOne(Wrappers.<GridEntity>lambdaQuery().eq(GridEntity::getGridCode, gridman.getGridCode()));
            gridman.setGridId(gridEntity.getId());
            if (list.size() > 0) {
                // 默认取出第一个
                User user = list.get(0);
@@ -127,6 +130,7 @@
    /**
     * 用户新增
     *
     * @param gridman
     */
    public void saveUser(GridmanEntity gridman) {
@@ -154,6 +158,7 @@
    /**
     * 网格员导入
     *
     * @param data
     * @param isCovered
     */
@@ -220,6 +225,7 @@
    /**
     * 查询网格id
     *
     * @param userId
     * @return
     */