From fdc3fe8b7e0cf97b225ecc9135a05f4bb2090518 Mon Sep 17 00:00:00 2001
From: tangzy <tangzy123456>
Date: Fri, 03 Sep 2021 17:53:21 +0800
Subject: [PATCH] 1.注册
---
src/main/java/org/springblade/modules/zc/controller/ZcController.java | 35 ++++++++++++++++++++++++++++++++---
1 files changed, 32 insertions(+), 3 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 f3be1be..dbd10ab 100644
--- a/src/main/java/org/springblade/modules/zc/controller/ZcController.java
+++ b/src/main/java/org/springblade/modules/zc/controller/ZcController.java
@@ -22,22 +22,29 @@
import io.swagger.annotations.ApiOperation;
import io.swagger.annotations.ApiParam;
import lombok.AllArgsConstructor;
+import org.springblade.common.vo.DeptVo;
import org.springblade.core.boot.ctrl.BladeController;
import org.springblade.core.mp.support.Condition;
import org.springblade.core.mp.support.Query;
import org.springblade.core.tool.api.R;
import org.springblade.core.tool.utils.DigestUtil;
import org.springblade.core.tool.utils.Func;
+import org.springblade.modules.information.entity.Information;
import org.springblade.modules.system.entity.User;
+import org.springblade.modules.system.service.IDeptService;
import org.springblade.modules.system.service.IUserService;
import org.springblade.modules.zc.entity.Zc;
import org.springblade.modules.zc.service.IZcService;
import org.springblade.modules.zc.vo.ZcVO;
import org.springframework.web.bind.annotation.*;
+import springfox.documentation.annotations.ApiIgnore;
import javax.validation.Valid;
import java.text.SimpleDateFormat;
+import java.util.Arrays;
import java.util.Date;
+import java.util.List;
+import java.util.Map;
/**
* 控制器
@@ -54,6 +61,8 @@
private final IZcService zcService;
private IUserService iUserService;
+
+ private final IDeptService deptFeignApi;
/**
* 详情
@@ -84,8 +93,27 @@
@ApiOperationSupport(order = 3)
@ApiOperation(value = "分页", notes = "传入zc")
public R<IPage<ZcVO>> page(ZcVO zc, Query query) {
- IPage<ZcVO> pages = zcService.selectZcPage(Condition.getPage(query), zc);
- return R.data(pages);
+ //获取部门数据
+ List<DeptVo> deptVos = deptFeignApi.selDeptList();
+ 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("")){
+ String[] split = page.getRecords().get(j).getDeptid().split(",");
+ List<String> list = Arrays.asList(split);
+ StringBuffer deptNameBuiffer = new StringBuffer();
+ //数据匹配封装
+ for (String deptId:list) {
+ for (DeptVo deptVo:deptVos) {
+ if (deptId.equals(deptVo.getId().toString())){
+ deptNameBuiffer.append(deptVo.getDeptName()).append(",");
+ }
+ }
+ }
+ //封装部门名称数据
+ page.getRecords().get(j).setDeptName(deptNameBuiffer.substring(0,deptNameBuiffer.length()-1));
+ }
+ }
+ return R.data(page);
}
/**
@@ -112,10 +140,11 @@
if (type.equals("1")){
User user = new User();
user.setAccount(zc.getUsername());
+ user.setTenantId("000000");
user.setPassword(DigestUtil.encrypt(zc.getPassword()));
user.setRealName(zc.getSname());
user.setCardid(zc.getCardid());
- user.setRoleId("1433232531179704321");
+ user.setRoleId(zc.getParentId());
user.setDeptId(zc.getDeptid());
iUserService.saveOrUpdate(user);
}
--
Gitblit v1.9.3