拿不到地址总表数据，不设置网格信息

linwei

2024-01-31 b3b566ebdfed4005aaa513da3d5d2fd3924903cc

 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;
@@ -64,12 +62,13 @@
   @Override
   public IPage<GridmanVO> selectGridmanPage(IPage<GridmanVO> page, GridmanVO gridman) {
      List<String> regionChildCodesList = SysCache.getRegionChildCodesByDeptId(AuthUtil.getDeptId());
      Integer isAdministrator = AuthUtil.isAdministrator()==true?1:2;
      return page.setRecords(baseMapper.selectGridmanPage(page, gridman,regionChildCodesList,isAdministrator));
      Integer isAdministrator = AuthUtil.isAdministrator() == true ? 1 : 2;
      return page.setRecords(baseMapper.selectGridmanPage(page, gridman, regionChildCodesList, isAdministrator));
   }

   /**
    * 网格员表 自定义新增或修改
    *
    * @param gridman
    * @return
    */
@@ -78,16 +77,20 @@
   public boolean saveOrUpdateGridman(GridmanEntity gridman) {
      boolean flag = false;
      // 修改
      if (null!=gridman.getId()) {
      if (null != gridman.getId()) {
         // 更新网格员信息
         flag = updateById(gridman);
      }else {
      } else {
         // 新增
         // 先判断用户表中是否已存在该用户，如果已存在则不新增，需要更新角色
         QueryWrapper<User> wrapper = new QueryWrapper<>();
         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);
@@ -101,22 +104,22 @@
            gridman.setUserId(user.getId());
            //匹配
            QueryWrapper<GridmanEntity> queryWrapper = new QueryWrapper<>();
            queryWrapper.eq("is_deleted",0)
               .eq("grid_id",gridman.getGridId())
               .eq("user_id",gridman.getUserId());
            queryWrapper.eq("is_deleted", 0)
               .eq("grid_id", gridman.getGridId())
               .eq("user_id", gridman.getUserId());
            GridmanEntity one = getOne(queryWrapper);
            if (null==one){
            if (null == one) {
               flag = save(gridman);
            }
         } else {
            saveUser(gridman);
            //匹配
            QueryWrapper<GridmanEntity> queryWrapper = new QueryWrapper<>();
            queryWrapper.eq("is_deleted",0)
               .eq("grid_id",gridman.getGridId())
               .eq("user_id",gridman.getUserId());
            queryWrapper.eq("is_deleted", 0)
               .eq("grid_id", gridman.getGridId())
               .eq("user_id", gridman.getUserId());
            GridmanEntity one = getOne(queryWrapper);
            if (null==one){
            if (null == one) {
               flag = save(gridman);
            }
         }
@@ -127,6 +130,7 @@

   /**
    * 用户新增
    *
    * @param gridman
    */
   public void saveUser(GridmanEntity gridman) {
@@ -154,6 +158,7 @@

   /**
    * 网格员导入
    *
    * @param data
    * @param isCovered
    */
@@ -165,8 +170,8 @@
         GridmanEntity gridmanEntity = Objects.requireNonNull(BeanUtil.copy(gridmanExcel, GridmanEntity.class));
         // 通过社区名称和网格名称获取网格id
         QueryWrapper<GridEntity> queryWrapper = new QueryWrapper<>();
         queryWrapper.eq("is_deleted",0)
            .eq("grid_code",gridmanExcel.getGridCode());
         queryWrapper.eq("is_deleted", 0)
            .eq("grid_code", gridmanExcel.getGridCode());
         GridEntity gridEntity = gridService.getOne(queryWrapper);
         // 设置网格id
         gridmanEntity.setGridId(gridEntity.getId());
@@ -220,6 +225,7 @@

   /**
    * 查询网格id
    *
    * @param userId
    * @return
    */