From 030cc847e46dcaa687f961785b458c6f9714ed49 Mon Sep 17 00:00:00 2001
From: zengh <123456>
Date: Tue, 10 Aug 2021 09:02:43 +0800
Subject: [PATCH] 问题修复
---
src/main/java/org/springblade/modules/zc/controller/ZcController.java | 23 +++++++++++++++++++++++
1 files changed, 23 insertions(+), 0 deletions(-)
diff --git a/src/main/java/org/springblade/modules/zc/controller/ZcController.java b/src/main/java/org/springblade/modules/zc/controller/ZcController.java
index 969465c..4b8ac51 100644
--- a/src/main/java/org/springblade/modules/zc/controller/ZcController.java
+++ b/src/main/java/org/springblade/modules/zc/controller/ZcController.java
@@ -92,6 +92,10 @@
public R<IPage<ZcVO>> page(ZcVO zc, Query query) {
//获取部门数据
List<DeptVo> deptVos = deptFeignApi.selDeptList();
+
+ //获取辖区数据
+ List<DeptVo> xqVos = deptFeignApi.selXQList();
+
IPage<ZcVO> page = zcService.selectZcPage(Condition.getPage(query), zc);
for (int j = 0; j < page.getRecords().size(); j++) {
if (page.getRecords().get(j).getDeptid() != null && !page.getRecords().get(j).getDeptid().equals("")){
@@ -108,6 +112,24 @@
}
//封装部门名称数据
page.getRecords().get(j).setDeptName(deptNameBuiffer.substring(0,deptNameBuiffer.length()-1));
+ }
+ }
+
+ for (int j = 0; j < page.getRecords().size(); j++) {
+ if (page.getRecords().get(j).getJurisdiction() != null && !page.getRecords().get(j).getJurisdiction().equals("")){
+ String[] split = page.getRecords().get(j).getJurisdiction().split(",");
+ List<String> list = Arrays.asList(split);
+ StringBuffer deptNameBuiffer = new StringBuffer();
+ //数据匹配封装
+ for (String deptId:list) {
+ for (DeptVo deptVo:xqVos) {
+ if (deptId.equals(deptVo.getId().toString())){
+ deptNameBuiffer.append(deptVo.getDeptName()).append(",");
+ }
+ }
+ }
+ //封装部门名称数据
+ page.getRecords().get(j).setXQName(deptNameBuiffer.substring(0,deptNameBuiffer.length()-1));
}
}
@@ -151,6 +173,7 @@
user.setPhone(zc.getPhone());
user.setDeptId(zc.getDeptid());
user.setRoleId(zc.getParentId());
+ user.setJurisdiction(zc.getJurisdiction());
user.setExamination_type("0");
user.setExamination_mx("正常");
iUserService.saveOrUpdate(user);
--
Gitblit v1.9.3