From 86d65e6f837ff14b090ffc3312c013987b6f67d8 Mon Sep 17 00:00:00 2001
From: zqy <2522236926@qq.com>
Date: 星期二, 14 十月 2025 21:59:13 +0800
Subject: [PATCH] 荣誉 新增两个字段的查询
---
ruoyi-admin/src/main/java/com/ruoyi/web/controller/zhang/ZfAncestorController.java | 65 ++++++++++++++++++++++++++------
1 files changed, 52 insertions(+), 13 deletions(-)
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/zhang/ZfAncestorController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/zhang/ZfAncestorController.java
index 8e276dc..e9690ca 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/zhang/ZfAncestorController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/zhang/ZfAncestorController.java
@@ -152,7 +152,7 @@
list = zfAncestorService.selectByCondition(zfAncestor);
// log.info("瀵煎嚭璁板綍涓�:{}", list);
ExcelUtil<AncestorClan> util = new ExcelUtil<>(AncestorClan.class);
- util.exportExcel(response, list, "瀹跺涵澶т簨浠惰褰曟暟鎹�");
+ util.exportExcel(response, list, "绁栧厛璁板綍鏁版嵁");
}
/**
@@ -166,7 +166,7 @@
List<AncestorClan> list = zfAncestorService.selectByIds(ids);
// log.info("瀵煎嚭璁板綍涓�:{}",list);
ExcelUtil<AncestorClan> util = new ExcelUtil<>(AncestorClan.class);
- util.exportExcel(response, list, "淇濇磥鏀剁撼璁板綍鏁版嵁");
+ util.exportExcel(response, list, "绁栧厛璁板綍鏁版嵁");
}
@@ -176,12 +176,56 @@
*/
@Log(title = "绁栧厛", businessType = BusinessType.UPDATE)
@PutMapping
- public AjaxResult edit(@RequestBody ZfAncestor zfAncestor) {
+ public AjaxResult edit(@RequestBody AncestorHelper ancestorHelper) {
- ZfAncestor spouseSex = zfAncestorService.update(zfAncestor);
- updateAncestor(zfAncestor);
- if (spouseSex.getId() != null)
- updateAncestor(spouseSex);
+// ZfAncestor spouseSex = zfAncestorService.update(zfAncestor);
+// updateAncestor(zfAncestor);
+// if (spouseSex.getId() != null)
+// updateAncestor(spouseSex);
+
+ //淇敼sys_user琛�
+ SysUser us = new SysUser();
+ if (ancestorHelper.getName() != null) {
+ us.setNickName(ancestorHelper.getName());
+ us.setUserName(ancestorHelper.getName());
+ // us.setStatus(String.valueOf(zfAncestor.getStatus()));
+ }
+ if(ancestorHelper.getSex() != null)
+ us.setSex(String.valueOf(ancestorHelper.getSex()));
+
+// us.setClanId(ancestorHelper.getClanId());
+ us.setUserId(ancestorHelper.getSysId());
+
+ if (!userService.checkNickNameUnique(us)) {
+ return error("淇敼绁栧厛'" + us.getNickName() + "'澶辫触锛岀櫥褰曡处鍙峰凡瀛樺湪");
+ }
+ userService.updateUser(us);
+
+
+ //淇敼z_info_user琛�
+ ZInfoUser infoUser = new ZInfoUser();
+ infoUser.setSysId(us.getUserId());
+ if (ancestorHelper.getName() != null) {
+ infoUser.setNickName(us.getNickName());
+ infoUser.setOldName(us.getUserName());
+ }
+ if(ancestorHelper.getSex() != null)
+ infoUser.setSex(Integer.parseInt(us.getSex()));
+ ZInfoUser infoBysysId = zInfoUserService.getInfoBysysId(us.getUserId());
+ infoUser.setUserId(infoBysysId.getUserId());
+
+ zInfoUserService.saveOrUpdate(infoUser);
+
+ //淇敼zf_ancestor琛�
+ ZfAncestor zfAncestor = new ZfAncestor();
+// zfAncestor.setClanId(ancestorHelper.getClanId());
+ if (ancestorHelper.getName() != null)
+ zfAncestor.setName(ancestorHelper.getName());
+ if(ancestorHelper.getSex() != null)
+ zfAncestor.setSex(ancestorHelper.getSex());
+ zfAncestor.setSysId(ancestorHelper.getSysId());
+
+ zfAncestorService.update(zfAncestor);
return AjaxResult.success();
}
@@ -235,7 +279,7 @@
return error("鏂板绁栧厛1'" + usa.getNickName() + "'澶辫触锛岀櫥褰曡处鍙峰凡瀛樺湪");
}
- us.setPassword(SecurityUtils.encryptPassword(usa.getPassword()));
+ usa.setPassword(SecurityUtils.encryptPassword(usa.getPassword()));
userService.insertUser(usa);
@@ -307,10 +351,6 @@
zfAncestor1.setStatus(0);
zfAncestor1.setSysId(usa.getUserId());
zfAncestorService.addData(zfAncestor1);
-
-
-
-
}
else{
//淇濆瓨绁栧厛绠＄悊鍛�,涔熷厛淇濆瓨鍒皊ys_user
@@ -351,7 +391,6 @@
zfAncestor.setSysId(us.getUserId());
zfAncestorService.addData(zfAncestor);
-
}
--
Gitblit v1.9.1