linwe
2024-08-09 8b7258c9427882bb1798f1502eaa35184c6e374e
src/main/java/org/springblade/modules/grid/service/impl/GridmanServiceImpl.java
@@ -20,11 +20,11 @@
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.common.param.CommonParamSet;
import org.springblade.core.secure.utils.AuthUtil;
import org.springblade.core.tool.utils.BeanUtil;
import org.springblade.core.tool.utils.Func;
import org.springblade.core.tool.utils.SpringUtil;
import org.springblade.modules.grid.entity.GridEntity;
import org.springblade.modules.grid.entity.GridmanEntity;
@@ -65,9 +65,8 @@
   @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));
      CommonParamSet commonParamSet = new CommonParamSet<>().invoke(GridmanVO.class, gridman);
      return page.setRecords(baseMapper.selectGridmanPage(page, gridman, commonParamSet.getRegionChildCodesList(), commonParamSet.getIsAdministrator()));
   }
   /**
@@ -277,17 +276,22 @@
   @Override
   public Object getGridStatistics(String code, String roleType) {
      Map<String, Object> objectObjectHashMap = new HashMap<>();
      List<String> communityCodeList = Func.toStrList(code);
      // 判断 communityCodeList
      if (communityCodeList != null && communityCodeList.size() == 0) {
         return objectObjectHashMap;
      }
      if (roleType.equals("2")) {
         Integer gridStatistics = baseMapper.getGridStatistics(code, null, roleType);
         Integer companyStatistics = baseMapper.getCompanyStatistics(code, null, roleType);
         Integer ownersCommitteeStatistics = baseMapper.getOwnersCommitteeStatistics(code, null, roleType);
         Integer gridStatistics = baseMapper.getGridStatistics(communityCodeList, null, roleType);
         Integer companyStatistics = baseMapper.getCompanyStatistics(communityCodeList, null, roleType);
         Integer ownersCommitteeStatistics = baseMapper.getOwnersCommitteeStatistics(communityCodeList, null, roleType);
         objectObjectHashMap.put("gridStatistics", gridStatistics);
         objectObjectHashMap.put("companyStatistics", companyStatistics);
         objectObjectHashMap.put("ownersStatistics", ownersCommitteeStatistics);
      } else {
         Integer gridStatistics = baseMapper.getGridStatistics(code, AuthUtil.getUserId(), roleType);
         Integer companyStatistics = baseMapper.getCompanyStatistics(code, AuthUtil.getUserId(), roleType);
         Integer ownersCommitteeStatistics = baseMapper.getOwnersCommitteeStatistics(code, AuthUtil.getUserId(), roleType);
         Integer gridStatistics = baseMapper.getGridStatistics(communityCodeList, AuthUtil.getUserId(), roleType);
         Integer companyStatistics = baseMapper.getCompanyStatistics(communityCodeList, AuthUtil.getUserId(), roleType);
         Integer ownersCommitteeStatistics = baseMapper.getOwnersCommitteeStatistics(communityCodeList, AuthUtil.getUserId(), roleType);
         objectObjectHashMap.put("gridStatistics", gridStatistics);
         objectObjectHashMap.put("companyStatistics", companyStatistics);
         objectObjectHashMap.put("ownersStatistics", ownersCommitteeStatistics);