From c4aed9ce680b823e86864aa83cd61487e69a3494 Mon Sep 17 00:00:00 2001
From: whywhyo <1511349576@qq.com>
Date: 星期二, 30 五月 2023 20:52:00 +0800
Subject: [PATCH] 123
---
ruoyi-admin/src/main/java/com/ruoyi/web/controller/zhang/ZInfoUserController.java | 12 +++++-------
1 files changed, 5 insertions(+), 7 deletions(-)
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/zhang/ZInfoUserController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/zhang/ZInfoUserController.java
index 2f8e4c9..1ceacc0 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/zhang/ZInfoUserController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/zhang/ZInfoUserController.java
@@ -15,6 +15,7 @@
import com.ruoyi.domain.dto.EmpowerDto;
import com.ruoyi.domain.dto.Genealogy;
import com.ruoyi.domain.dto.GenealogyExportDto;
+import com.ruoyi.domain.dto.RelationDto;
import com.ruoyi.service.ZInfoUserService;
import lombok.extern.slf4j.Slf4j;
import org.springframework.web.bind.annotation.*;
@@ -114,9 +115,9 @@
@Log(title = "涓汉璇︾粏淇℃伅璁板綍", businessType = BusinessType.INSERT)
@PostMapping
public AjaxResult add(@RequestBody ZInfoUser zInfoUser) {
- if (!Pattern.matches("^[\\d]+(?:,[\\d]+)*$",zInfoUser.getFamilyId())) {
- throw new RuntimeException("璇疯緭鍏ュ彧鏈夋暟瀛楀拰鑻辨枃閫楀彿鐨勫瓧绗︿覆锛屼笖鏁板瓧鍜岄�楀彿蹇呴』浜ゆ浛鍑虹幇");
- }
+// if (!Pattern.matches("^[\\d]+(?:,[\\d]+)*$",zInfoUser.getFamilyId())) {
+// throw new RuntimeException("璇疯緭鍏ュ彧鏈夋暟瀛楀拰鑻辨枃閫楀彿鐨勫瓧绗︿覆锛屼笖鏁板瓧鍜岄�楀彿蹇呴』浜ゆ浛鍑虹幇");
+// }
SysUser user = SecurityUtils.getLoginUser().getUser();
Long userId = user.getUserId();
zInfoUser.setUserId(userId);
@@ -153,15 +154,12 @@
*/
@GetMapping("/relation")
public AjaxResult listMyRelation() {
- SysUser user = SecurityUtils.getLoginUser().getUser();
- Long userId = user.getUserId();
- return zInfoUserService.searchMyRelation(userId);
+ return zInfoUserService.searchMyRelation();
}
@PostMapping("/relation")
public AjaxResult addRelation(@RequestBody ZfRelation zfRelation){
return zInfoUserService.addRelation(zfRelation);
-
}
@PutMapping("/relation")
--
Gitblit v1.9.1