From b4754ea670156f7f799311a9fdc9b3d380982fcb Mon Sep 17 00:00:00 2001
From: Jinquan_Ou <Jinquan@gdut.com>
Date: 星期四, 06 四月 2023 18:23:00 +0800
Subject: [PATCH] 555
---
zhang-content/src/main/java/com/ruoyi/service/impl/IZfPropertyServiceImpl.java | 39 ++++++++++++++++++++++++++++++++++-----
1 files changed, 34 insertions(+), 5 deletions(-)
diff --git a/zhang-content/src/main/java/com/ruoyi/service/impl/IZfPropertyServiceImpl.java b/zhang-content/src/main/java/com/ruoyi/service/impl/IZfPropertyServiceImpl.java
index 36dbe29..c39ef1d 100644
--- a/zhang-content/src/main/java/com/ruoyi/service/impl/IZfPropertyServiceImpl.java
+++ b/zhang-content/src/main/java/com/ruoyi/service/impl/IZfPropertyServiceImpl.java
@@ -4,15 +4,20 @@
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.ruoyi.common.core.domain.AjaxResult;
+import com.ruoyi.common.core.domain.entity.SysUser;
import com.ruoyi.common.utils.MapUtils;
+import com.ruoyi.common.utils.SecurityUtils;
import com.ruoyi.common.utils.StringUtils;
+import com.ruoyi.domain.ZInfoUser;
import com.ruoyi.domain.ZfEvent;
import com.ruoyi.domain.ZfProperty;
import com.ruoyi.mapper.ZfPropertyMapper;
import com.ruoyi.service.IZfPropertyService;
+import com.ruoyi.service.ZInfoUserService;
import lombok.extern.slf4j.Slf4j;
import org.springframework.stereotype.Service;
+import javax.annotation.Resource;
import java.text.ParseException;
import java.text.SimpleDateFormat;
import java.time.LocalDateTime;
@@ -32,9 +37,13 @@
@Service
public class IZfPropertyServiceImpl extends ServiceImpl<ZfPropertyMapper, ZfProperty> implements IZfPropertyService {
+ @Resource
+ ZInfoUserService zInfoUserService;
+
@Override
public List<ZfProperty> selectByCondition(ZfProperty zfProperty) {
- LambdaQueryWrapper<ZfProperty> lambdaQueryWrapper = buildCondition(zfProperty);
+ String familyIds = listFamilyIds();
+ LambdaQueryWrapper<ZfProperty> lambdaQueryWrapper = buildCondition(zfProperty,familyIds);
List<ZfProperty> list = list(lambdaQueryWrapper);
log.info("杩斿洖鐨勬暟鎹负:{}",list);
return list;
@@ -52,14 +61,34 @@
return lqw;
}
+ private LambdaQueryWrapper<ZfProperty> buildCondition(ZfProperty zfProperty,String familyIds) {
+ LambdaQueryWrapper<ZfProperty> lqw = buildCondition(zfProperty);
+ if (familyIds.contains(",")) {
+ String[] familyList = familyIds.split(",");
+ for (String familyId : familyList) {
+ lqw.or().eq(ZfProperty::getFamilyId,familyId);
+ }
+ }else {
+ lqw.eq(ZfProperty::getFamilyId,familyIds);
+ }
+ return lqw;
+ }
+
+ private String listFamilyIds(){
+ SysUser user = SecurityUtils.getLoginUser().getUser();
+ Long userId = user.getUserId();
+ LambdaQueryWrapper<ZInfoUser> zInfoUserLambdaQueryWrapper = new LambdaQueryWrapper<>();
+ zInfoUserLambdaQueryWrapper.eq(ZInfoUser::getUserId,userId);
+ ZInfoUser zInfoUser = zInfoUserService.getOne(zInfoUserLambdaQueryWrapper);
+ return zInfoUser.getFamilyId();
+ }
+
@Override
public AjaxResult selectPropertyList(ZfProperty zfProperty,Integer pageNum,Integer pageSize) {
-
- LambdaQueryWrapper<ZfProperty> lqw = buildCondition(zfProperty);
-
+ String familyIds = listFamilyIds();
+ LambdaQueryWrapper<ZfProperty> lqw = buildCondition(zfProperty,familyIds);
Page<ZfProperty> zfPropertyPage = new Page<>(pageNum,pageSize);
Page<ZfProperty> pageResult = page(zfPropertyPage, lqw);
-
HashMap<String, Object> data = MapUtils.getResult(pageResult);
return AjaxResult.success(data);
--
Gitblit v1.9.1