bug修复

linwe

2024-06-21 02ee149247ca123ff4df76d439fa93d7ae764f1f

 src/main/java/org/springblade/modules/place/service/impl/PlaceServiceImpl.java

@@ -18,6 +18,7 @@

import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import liquibase.repackaged.org.apache.commons.lang3.StringUtils;
@@ -28,6 +29,7 @@
import org.springblade.common.utils.SpringUtils;
import org.springblade.core.secure.utils.AuthUtil;
import org.springblade.core.tool.utils.BeanUtil;
import org.springblade.core.tool.utils.ObjectUtil;
import org.springblade.core.tool.utils.SpringUtil;
import org.springblade.modules.category.entity.CategoryEntity;
import org.springblade.modules.category.service.ICategoryService;
@@ -42,13 +44,13 @@
import org.springblade.modules.house.service.IHouseholdService;
import org.springblade.modules.place.entity.*;
import org.springblade.modules.place.excel.ExportPlaceExcel;
import org.springblade.modules.place.excel.ImportPlaceExcel;
import org.springblade.modules.place.excel.NinePlaceExcel;
import org.springblade.modules.place.excel.PlaceAndRelExcel;
import org.springblade.modules.place.excel.ImportPlaceExcel;
import org.springblade.modules.place.mapper.PlaceMapper;
import org.springblade.modules.place.service.*;
import org.springblade.modules.place.vo.PlacePoiLabelVO;
import org.springblade.modules.place.vo.PlaceVO;
import org.springblade.modules.place.mapper.PlaceMapper;
import org.springblade.modules.police.entity.PoliceAffairsGridEntity;
import org.springblade.modules.police.service.IPoliceAffairsGridService;
import org.springblade.modules.system.entity.DictBiz;
@@ -59,7 +61,6 @@
import org.springblade.modules.system.service.IUserService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import com.baomidou.mybatisplus.core.metadata.IPage;
import org.springframework.transaction.annotation.Transactional;

import java.util.*;
@@ -117,6 +118,9 @@
   public IPage<PlaceVO> selectPlacePage(IPage<PlaceVO> page, PlaceVO place) {
      // 公共参数设置
      CommonParamSet commonParamSet = new CommonParamSet().invoke(PlaceVO.class, place);
      if (StringUtils.isNotBlank(place.getPoiCodes())) {
         place.setPoiCodeList(Arrays.asList(place.getPoiCodes().split(",")));
      }
      List<PlaceVO> placeVOS = baseMapper.selectPlacePage(page,
         place,
         commonParamSet.getGridCodeList(),
@@ -205,7 +209,7 @@
      // 保存从业人员
      savePlacePractitioner(placeVO);
      // 判断是否校园
      if (placeVO.getLabel().startsWith("1601")) {
      if (placeVO.getLabel().startsWith("16010")) {
         // 校园的新增一个主体用户和一个通用用户
         addSchoolUser(placeVO);
      }
@@ -723,12 +727,13 @@
    * @return
    */
   @Transactional(rollbackFor = Exception.class)
   public User addSchoolUser(PlaceVO placeVO) {
   public void addSchoolUser(PlaceVO placeVO) {
      User newUser = new User();
      if (StringUtils.isNotBlank(placeVO.getPlaceName())) {
//         placeVO.setPrincipal(placeVO.getPrincipal());
//         placeVO.setPrincipalPhone(placeVO.getPrincipalPhone());
         //如果用户不存在，则新增一个用户
      // 查询账号是否存在，存在则不创建
      long count = userService.count(Wrappers.<User>lambdaQuery()
         .eq(User::getAccount, placeVO.getPlaceName() + "主体"));
      // 如果用户不存在，则新增一个用户
      if (StringUtils.isNotBlank(placeVO.getPlaceName()) && count <= 0) {
         newUser.setAccount(placeVO.getPlaceName() + "主体");
         newUser.setName(placeVO.getPlaceName() + "-主体");
         newUser.setRealName(placeVO.getPlaceName() + "-主体");
@@ -736,8 +741,7 @@
         newUser.setDeptId("1727979636479037441");
         // 校园主体，
         newUser.setRoleId("1780786647371706370");

         //默认密码为 123456
         // 默认密码为 123456
         newUser.setPassword("123456");
         // 设置机构
         // 用户新增
@@ -755,12 +759,7 @@
         placeVO.setUniversalAccount(newUser.getId());
         // 更新场所信息
         updateById(placeVO);
         //绑定id
//         placeVO.setPrincipalUserId(newUser.getId());
         //给人员打上场所负责人的标签
//         baseMapper.saveUserLabel(newUser.getId(), 1002);
      }
      return newUser;
   }

   /**
@@ -1492,6 +1491,9 @@
         PlaceEntity placeEntity = getById(id);
         if (null != placeEntity.getPrincipalUserId()) {
            User user = userService.getById(placeEntity.getPrincipalUserId());
            if (ObjectUtil.isEmpty(user)) {
               return;
            }
            // 查询场所判断是否还绑定有其他的场所
            QueryWrapper<PlaceEntity> queryWrapper = new QueryWrapper<>();
            queryWrapper.eq("is_deleted", 0).eq("principal_user_id", user.getId());