机构删除异常调整

zhongrj

2024-04-28 3107f6f4a90b5f5b7c6ff95ec2ae2296a2e307f6

 src/main/java/org/springblade/modules/system/service/impl/UserServiceImpl.java

@@ -25,6 +25,7 @@
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import lombok.AllArgsConstructor;
import org.apache.commons.lang3.StringUtils;
import org.apache.ibatis.annotations.Param;
import org.apache.logging.log4j.util.Strings;
import org.flowable.idm.engine.impl.persistence.entity.UserEntity;
import org.springblade.common.cache.DictCache;
@@ -50,11 +51,11 @@
import org.springblade.modules.grid.service.IGridmanService;
import org.springblade.modules.house.entity.HouseholdEntity;
import org.springblade.modules.house.service.IHouseholdService;
import org.springblade.modules.house.vo.HouseholdVO;
import org.springblade.modules.police.entity.PoliceAffairsGridEntity;
import org.springblade.modules.police.service.IPoliceAffairsGridService;
import org.springblade.modules.policeAlarmRecords.entity.PoliceAlarmRecordsEntity;
import org.springblade.modules.policeAlarmRecords.service.IPoliceAlarmRecordsService;
import org.springblade.modules.property.entity.PropertyCompanyEntity;
import org.springblade.modules.property.service.IPropertyCompanyDistrictService;
import org.springblade.modules.property.service.IPropertyCompanyService;
import org.springblade.modules.system.entity.*;
import org.springblade.modules.system.excel.PoliceUserExcel;
@@ -273,6 +274,30 @@
      return buildUserInfo(user);
   }

   /**
    * 用户信息
    *
    * @param tenantId
    * @param account
    * @param password
    * @param type 登录类型 2：pc 3：app
    * @return
    */
   @Override
   public UserInfo userInfo(String tenantId, String account, String password, Integer type) {
      User user = baseMapper.getUser(tenantId, account, password);
      return buildUserInfo(user, type);
   }

   /**
    * 用户信息
    *
    * @param tenantId
    * @param account
    * @param password
    * @param userEnum
    * @return
    */
   @Override
   public UserInfo userInfo(String tenantId, String account, String password, UserEnum userEnum) {
      User user = baseMapper.getUser(tenantId, account, password);
@@ -313,6 +338,36 @@
         if (ObjectUtil.isNotEmpty(query)) {
            detail.set("ext", query.getUserExt());
         }
      }
      userInfo.setDetail(detail);
      return userInfo;
   }

   /**
    *
    * @param user
    * @param type 登录类型 2：pc 3：app
    * @return
    */
   private UserInfo buildUserInfo(User user, Integer type) {
      if (ObjectUtil.isEmpty(user)) {
         return null;
      }
      UserInfo userInfo = new UserInfo();
      userInfo.setUser(user);
      if (Func.isNotEmpty(user)) {
         // 判断登录类型设置对应的角色id
         user.setRoleId(Strings.join(roleService.getRoleIdStrByRoleIdAndType(user.getRoleId(),type), ','));
         // 设置角色别名
         List<String> roleAlias = roleService.getRoleAliases(user.getRoleId());
         userInfo.setRoles(roleAlias);
      }
      // 根据每个用户平台，建立对应的detail表，通过查询将结果集写入到detail字段
      Kv detail = Kv.create().set("type", null);
      UserOther userOther = new UserOther();
      UserOther query = userOther.selectOne(Wrappers.<UserOther>lambdaQuery().eq(UserOther::getUserId, user.getId()));
      if (ObjectUtil.isNotEmpty(query)) {
         detail.set("ext", query.getUserExt());
      }
      userInfo.setDetail(detail);
      return userInfo;
@@ -446,8 +501,12 @@
   }

   @Override
   public List<UserExcel> exportUser(Wrapper<User> queryWrapper) {
      List<UserExcel> userList = baseMapper.exportUser(queryWrapper);
   public List<UserExcel> exportUser(Wrapper<User> queryWrapper, String deptId) {
      if (Strings.isBlank(deptId) && !AuthUtil.isAdministrator() && !AuthUtil.isAdmin()) {
         deptId = AuthUtil.getDeptId();
      }
      List<Long> deptIdList = SysCache.getDeptChildIds(deptId);
      List<UserExcel> userList = baseMapper.exportUser(queryWrapper, deptIdList);
      userList.forEach(user -> {
         user.setUserTypeName(DictCache.getValue(DictEnum.USER_TYPE, user.getUserType()));
         user.setRoleName(StringUtil.join(SysCache.getRoleNames(user.getRoleId())));
@@ -604,24 +663,28 @@
         IGridmanService bean = SpringUtil.getBean(IGridmanService.class);
         return bean.getGridManByCode(houseCode);
      } else {
//         IPropertyCompanyDistrictService bean1 = SpringUtil.getBean(IPropertyCompanyDistrictService.class);
//         return bean1.getDistictUserByCode(houseCode);
         String deptId = AuthUtil.getDeptId();
         List<Long> deptIdList = SysCache.getDeptChildIds(deptId);
         return baseMapper.selectUserByDept(deptIdList);
         IPropertyCompanyDistrictService bean1 = SpringUtil.getBean(IPropertyCompanyDistrictService.class);
         return bean1.getDistictUserByCode(houseCode);
         // 通过huosecode 查询物业工作人员
//         String deptId = AuthUtil.getDeptId();
//         List<Long> deptIdList = SysCache.getDeptChildIds(deptId);
//         return baseMapper.selectUserByDept(deptIdList);
      }
   }

   /**
    * 通过小区id查询物业人员
    *
    * @param districtId
    * @param building
    * @return
    */
   @Override
   public List<UserEntity> getUserInfoByDistrictId(String districtId, String building) {
      return baseMapper.getUserInfoByDistrictId(districtId, building);
   }

   @Override
   public List<User> getUserInfoByDistrictIds(String districtIds) {
      List<String> list = JSON.parseArray(districtIds).toJavaList(String.class);
      return baseMapper.getUserInfoByDistrictIds(list);
   }


   /**
    * 处理漏绑定的user_dept
@@ -831,14 +894,16 @@
   @Override
   public List<User> getPoliceUser(String longitude, String latitude, String houseCode) {
      List<User> policeUser = baseMapper.getPoliceUser(longitude, latitude);
      // todo 自动生成警单
      IPoliceAlarmRecordsService policeAlarmRecordsService = SpringUtil.getBean(IPoliceAlarmRecordsService.class);
      PoliceAlarmRecordsEntity policeAlarmRecordsEntity = new PoliceAlarmRecordsEntity();
      policeAlarmRecordsEntity.setHouseCode(houseCode);
      if (policeUser != null && policeUser.size() == 1) {
         policeAlarmRecordsEntity.setPoliceId(policeUser.get(0).getId());
      }
      policeAlarmRecordsService.save(policeAlarmRecordsEntity);
      // 自动生成警单
//      if (StringUtils.isNotBlank(houseCode)) {
//         IPoliceAlarmRecordsService policeAlarmRecordsService = SpringUtil.getBean(IPoliceAlarmRecordsService.class);
//         PoliceAlarmRecordsEntity policeAlarmRecordsEntity = new PoliceAlarmRecordsEntity();
//         policeAlarmRecordsEntity.setHouseCode(houseCode);
//         if (policeUser != null && policeUser.size() == 1) {
//            policeAlarmRecordsEntity.setPoliceId(policeUser.get(0).getId());
//         }
//         policeAlarmRecordsService.save(policeAlarmRecordsEntity);
//      }
      return policeUser;
   }
}