投票人员查询优化

linwei

2024-02-22 7bcd0d2d7510cb2ba67099cd768e1b2b6d047dc2

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

@@ -17,6 +17,7 @@
package org.springblade.modules.system.service.impl;


import com.alibaba.fastjson.JSON;
import com.baomidou.mybatisplus.core.conditions.Wrapper;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
@@ -212,9 +213,9 @@
   }

   @Override
   public IPage<User> selectUserPage(IPage<User> page, User user, Long deptId, String tenantId) {
      if (null == deptId && !AuthUtil.isAdministrator()) {
         deptId = Long.parseLong(AuthUtil.getDeptId());
   public IPage<User> selectUserPage(IPage<User> page, User user, String deptId, String tenantId) {
      if (Strings.isBlank(deptId) && !AuthUtil.isAdministrator() && !AuthUtil.isAdmin()) {
         deptId = AuthUtil.getDeptId();
      }
      List<Long> deptIdList = SysCache.getDeptChildIds(deptId);
      return page.setRecords(baseMapper.selectUserPage(page, user, deptIdList, tenantId));
@@ -609,6 +610,12 @@
      return baseMapper.getUserInfoByDistrictId(districtId, building);
   }

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

   /**
    * 处理漏绑定的user_dept
    */
@@ -748,8 +755,14 @@
               list.remove(deptPcs.getId().toString());
               user.setDeptId(String.join(",",list));
            }
            if (!user.getDeptId().contains(dept.getId().toString())) {
               user.setDeptId(user.getDeptId() + "," + dept.getId());
            // 删完后可能就没了
            if (!Strings.isBlank(user.getDeptId())) {
               if (!user.getDeptId().contains(dept.getId().toString())) {
                  user.setDeptId(user.getDeptId() + "," + dept.getId());
               }
            }else {
               // 删完后的
               user.setDeptId(dept.getId().toString());
            }
         }else {
            if (!user.getDeptId().contains(dept.getId().toString())) {