From daef9edffb73d542ff1eba4beb215ffc7b306254 Mon Sep 17 00:00:00 2001
From: zhongrj <646384940@qq.com>
Date: Thu, 28 Dec 2023 18:44:46 +0800
Subject: [PATCH] bug 修复
---
src/main/java/org/springblade/modules/place/service/impl/PlaceExtServiceImpl.java | 25 ++++++++++++++++++++++---
1 files changed, 22 insertions(+), 3 deletions(-)
diff --git a/src/main/java/org/springblade/modules/place/service/impl/PlaceExtServiceImpl.java b/src/main/java/org/springblade/modules/place/service/impl/PlaceExtServiceImpl.java
index 0f6d6a6..5d59302 100644
--- a/src/main/java/org/springblade/modules/place/service/impl/PlaceExtServiceImpl.java
+++ b/src/main/java/org/springblade/modules/place/service/impl/PlaceExtServiceImpl.java
@@ -19,6 +19,7 @@
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import org.springblade.core.secure.utils.AuthUtil;
+import org.springblade.modules.grid.service.IGridService;
import org.springblade.modules.house.entity.HouseTenantEntity;
import org.springblade.modules.house.vo.HouseTenantVO;
import org.springblade.modules.place.entity.PlaceEntity;
@@ -60,6 +61,9 @@
@Autowired
private IPlacePractitionerService placePractitionerService;
+ @Autowired
+ private IGridService gridService;
+
/**
* 自定义查询
* @param page
@@ -68,7 +72,17 @@
*/
@Override
public IPage<PlaceExtVO> selectPlaceExtPage(IPage<PlaceExtVO> page, PlaceExtVO placeExt) {
- return page.setRecords(baseMapper.selectPlaceExtPage(page, placeExt));
+ List<String> list = new ArrayList<>();
+ if (null!=placeExt.getRoleName() && !placeExt.getRoleName().equals("")){
+ if (placeExt.getRoleName().equals("网格员")){
+ // 查询对应的房屋地址code
+ list = gridService.getAddressCodeListByUserId(AuthUtil.getUserId());
+ }
+ if (!placeExt.getRoleName().equals("系统管理员")){
+ placeExt.setCreateUser(AuthUtil.getUserId());
+ }
+ }
+ return page.setRecords(baseMapper.selectPlaceExtPage(page, placeExt,list));
}
/**
@@ -176,8 +190,8 @@
taskEntity.setId(placeExt.getTaskId());
taskEntity.setStatus(placeExt.getConfirmFlag());
taskEntity.setType(1);
- taskEntity.setFrequency(3);
- taskEntity.setName(placeEntity.getPlaceName() + "信息完善任务" + System.currentTimeMillis());
+ taskEntity.setFrequency(1);
+ taskEntity.setName(placeEntity.getPlaceName() + "信息完善");
// 新增任务
boolean save = taskService.save(taskEntity);
if (save){
@@ -210,4 +224,9 @@
// 返回
return detail;
}
+
+ @Override
+ public Integer selectCount(Long userId, String neiCode, Integer confirmFlag) {
+ return baseMapper.selectCount(userId, neiCode, confirmFlag);
+ }
}
--
Gitblit v1.9.3