From 6174f8c153f5b02436d1f05dec709dea86e51e1a Mon Sep 17 00:00:00 2001
From: zhongrj <646384940@qq.com>
Date: Sun, 05 Nov 2023 22:25:22 +0800
Subject: [PATCH] 住户查询修改

---
 src/main/java/org/springblade/modules/house/service/impl/HouseholdServiceImpl.java |   36 +++++++++++++++++++++++++++++++++++-
 1 files changed, 35 insertions(+), 1 deletions(-)

diff --git a/src/main/java/org/springblade/modules/house/service/impl/HouseholdServiceImpl.java b/src/main/java/org/springblade/modules/house/service/impl/HouseholdServiceImpl.java
index 7eb2410..a542095 100644
--- a/src/main/java/org/springblade/modules/house/service/impl/HouseholdServiceImpl.java
+++ b/src/main/java/org/springblade/modules/house/service/impl/HouseholdServiceImpl.java
@@ -24,6 +24,9 @@
 import org.springblade.modules.house.mapper.HouseholdMapper;
 import org.springblade.modules.house.service.IHouseholdService;
 import org.springblade.core.mp.base.BaseServiceImpl;
+import org.springblade.modules.system.entity.DictBiz;
+import org.springblade.modules.system.service.IDictBizService;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 
@@ -38,6 +41,9 @@
  */
 @Service
 public class HouseholdServiceImpl extends ServiceImpl<HouseholdMapper, HouseholdEntity> implements IHouseholdService {
+
+	@Autowired
+	private IDictBizService dictBizService;
 
 	@Override
 	public IPage<HouseholdVO> selectHouseholdPage(IPage<HouseholdVO> page, HouseholdVO household) {
@@ -61,7 +67,35 @@
 	 */
 	@Override
 	public List<HouseholdVO> getHouseholdListByCode(String code) {
-		return baseMapper.getHouseholdListByCode(code);
+		// 查询
+		List<HouseholdVO> householdList = baseMapper.getHouseholdListByCode(code);
+		// 处理字典
+		handleDictBiz(householdList);
+		// 返回
+		return householdList;
+	}
+
+	/**
+	 * 处理字典
+	 * @param householdList
+	 */
+	private void handleDictBiz(List<HouseholdVO> householdList) {
+		if (householdList.size()>0){
+			// 查询角色关系字典
+			List<DictBiz> dictBizList = dictBizService.getList("roleRelation");
+			if (dictBizList.size()>0) {
+				// 遍历
+				for (HouseholdVO householdVO : householdList) {
+					if (null != householdVO.getRelationship()) {
+						for (DictBiz dictBiz : dictBizList) {
+							if (householdVO.getRelationship().toString().equals(dictBiz.getDictKey())) {
+								householdVO.setRoleRelationName(dictBiz.getDictValue());
+							}
+						}
+					}
+				}
+			}
+		}
 	}
 
 	/**

--
Gitblit v1.9.3