1.社保

tangzy

2021-09-16 0af331c7df1f4e3365b3cb5abd60eaaa09807513

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

@@ -21,6 +21,7 @@
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import lombok.AllArgsConstructor;
import org.springblade.common.cache.SysCache;
import org.springblade.common.vo.DeptVo;
import org.springblade.core.log.exception.ServiceException;
import org.springblade.core.mp.support.Condition;
import org.springblade.core.secure.utils.AuthUtil;
@@ -207,10 +208,6 @@
      return ForestNodeMerger.merge(baseMapper.securityLazyTree(jurisdiction, parentId));
   }

   @Override
   public List<String> selectIn() {
      return baseMapper.selectIn();
   }

   /**
    * 懒加载获取部门树形结构(包含用户数据)
@@ -273,14 +270,14 @@
               Dept dept = new Dept();
               dept.setDeptName(jurisdiction.getDeptName());
               Dept dept1 = this.getOne(Condition.getQueryWrapper(dept));
               map = baseMapper.lazyTreeUsersPublicSecurity(type, dept1.getId(), one.getJurisdiction());
               map = baseMapper.lazyTreeUsersPublicSecurity(null, dept1.getId(), one.getJurisdiction());
            }
         }
      }
      //民警向民警汇报，需要南昌市及当前民警所在辖区的部门数据
      if(type==3){
         //当前取所有的民警数据
         map = baseMapper.lazyTreeUsersPublicSecuritys(type,null,null);
         map = baseMapper.lazyTreeUsersPublicSecuritys(null,deptId,null);
      }
      List<TreeNodes> tree = new ArrayList<>();
      Map<Long, TreeNodes> finalMap = map;
@@ -293,4 +290,14 @@
      });
      return tree;
   }

   @Override
   public List<DeptVO> selectInfo() {
      return ForestNodeMerger.merge(baseMapper.selectInfo());
   }

   @Override
   public List<DeptVo> selDeptList() {
      return baseMapper.selDeptList();
   }
}