From b3b566ebdfed4005aaa513da3d5d2fd3924903cc Mon Sep 17 00:00:00 2001
From: linwei <872216696@qq.com>
Date: Wed, 31 Jan 2024 16:17:54 +0800
Subject: [PATCH] 拿不到地址总表数据，不设置网格信息
---
src/main/java/org/springblade/modules/grid/service/impl/GridWorkLogServiceImpl.java | 19 +++++++------------
1 files changed, 7 insertions(+), 12 deletions(-)
diff --git a/src/main/java/org/springblade/modules/grid/service/impl/GridWorkLogServiceImpl.java b/src/main/java/org/springblade/modules/grid/service/impl/GridWorkLogServiceImpl.java
index e33c2aa..e3b0890 100644
--- a/src/main/java/org/springblade/modules/grid/service/impl/GridWorkLogServiceImpl.java
+++ b/src/main/java/org/springblade/modules/grid/service/impl/GridWorkLogServiceImpl.java
@@ -19,6 +19,7 @@
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import org.apache.logging.log4j.util.Strings;
+import org.springblade.common.cache.SysCache;
import org.springblade.common.utils.SpringUtils;
import org.springblade.core.secure.utils.AuthUtil;
import org.springblade.modules.grid.entity.GridWorkLogEntity;
@@ -45,20 +46,14 @@
@Service
public class GridWorkLogServiceImpl extends ServiceImpl<GridWorkLogMapper, GridWorkLogEntity> implements IGridWorkLogService {
-
- @Autowired
- private IDeptService deptService;
-
@Override
public IPage<GridWorkLogVO> selectGridWorkLogPage(IPage<GridWorkLogVO> page, GridWorkLogVO gridWorkLog) {
- Dept dept = deptService.getById(AuthUtil.getDeptId());
- if (null!=dept){
- gridWorkLog.setRegionCode(dept.getRegionCode());
- }
+ List<String> regionChildCodesList = SysCache.getRegionChildCodesByDeptId(AuthUtil.getDeptId());
+ Integer isAdministrator = AuthUtil.isAdministrator()==true?1:2;
if (!Strings.isBlank(gridWorkLog.getRoleName()) && gridWorkLog.getRoleName().equals("网格员")){
gridWorkLog.setGridId(getGridId());
}
- return page.setRecords(baseMapper.selectGridWorkLogPage(page, gridWorkLog));
+ return page.setRecords(baseMapper.selectGridWorkLogPage(page, gridWorkLog,regionChildCodesList,isAdministrator));
}
/**
* 获取网格员id
@@ -76,12 +71,12 @@
/**
* 走访日志数量统计
- * @param gridId 网格id
+ * @param gridCode 网格编号
* @param status 状态
* @return
*/
@Override
- public Integer getGridWorkCountHandleCount(Integer gridId, Integer status) {
- return baseMapper.getGridWorkCountHandleCount(gridId,status);
+ public Integer getGridWorkCountHandleCount(String gridCode, Integer status) {
+ return baseMapper.getGridWorkCountHandleCount(gridCode,status);
}
}
--
Gitblit v1.9.3