From adeec8aafe23ed8255941db26e2245d7da8f6405 Mon Sep 17 00:00:00 2001
From: feige <791364011@qq.com>
Date: 星期三, 08 一月 2025 15:30:41 +0800
Subject: [PATCH] 修改了家庭设备排序时间
---
ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysUserController.java | 28 +++++++++++++++++++++++-----
1 files changed, 23 insertions(+), 5 deletions(-)
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysUserController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysUserController.java
index 52534e6..c5739a7 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysUserController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysUserController.java
@@ -96,6 +96,24 @@
List<SysUser> list = userService.selectUserList(user);
return getDataTable(list);
}
+ @GetMapping("/listCommonUser")
+ public TableDataInfo listCommonUser(SysUser user)
+ {
+ startPage();
+ // System.out.println(user.getClanId());
+ System.out.println("----------------++++++++++++==0------------");
+ List<SysUser> list = userService.selectCommonUserList(user);
+ return getDataTable(list);
+ }
+ @Log(title = "鐢ㄦ埛绠＄悊", businessType = BusinessType.EXPORT)
+ @PreAuthorize("@ss.hasPermi('system:user:export')")
+ @PostMapping("/exportCommonUser")
+ public void exportCommonUser(HttpServletResponse response, SysUser user)
+ {
+ List<SysUser> list = userService.selectCommonUserList(user);
+ ExcelUtil<SysUser> util = new ExcelUtil<SysUser>(SysUser.class);
+ util.exportExcel(response, list, "鐢ㄦ埛鏁版嵁");
+ }
@Log(title = "鐢ㄦ埛绠＄悊", businessType = BusinessType.EXPORT)
@PreAuthorize("@ss.hasPermi('system:user:export')")
@@ -175,7 +193,7 @@
//System.out.println(sysUserRole.getRoleId());
System.out.println("浣犲ソ鍛�");
System.out.println(user.getRoleId());
- if (user.getRoleId().equals(102L)){
+ if (user.getRoleId() != null && user.getRoleId().equals(102L)){
ZInfoUser infoUser = new ZInfoUser();
infoUser.setUserId(user.getUserId());
infoUser.setOldName(user.getUserName());
@@ -183,7 +201,7 @@
infoUser.setIsMyFamily(user.getIsMyFamily());
infoUser.setMomId(user.getMid());
infoUser.setFatherId(user.getFid());
- infoUser.setSex(Integer.valueOf(user.getSex()));
+ if (user.getSex() != null)infoUser.setSex(Integer.valueOf(user.getSex()));
// infoUser.setFamilyId(user.getFamilyId());
infoUser.setSysId(user.getSysId());
@@ -243,11 +261,11 @@
}
- if(infoUser.getFamilyId()!=null)
+ if(infoUser.getIsMyFamily() == 1)
zInfoUserService.saveOrUpdate(infoUser);
else {
System.out.println("瀹跺涵鎴愬憳涓嶈兘淇敼涓烘櫘閫氱敤鎴�");
- return AjaxResult.success("瀹跺涵鎴愬憳涓嶈兘淇敼涓烘櫘閫氱敤鎴�");
+ return AjaxResult.error("瀹跺涵鎴愬憳涓嶈兘淇敼涓烘櫘閫氱敤鎴�");
}
//鏇存柊閰嶅伓淇℃伅
if(user.getSpouseId()!=null) {
@@ -288,7 +306,7 @@
}
else {
System.out.println("daniuni");
- return AjaxResult.success("瀹跺涵鎴愬憳涓嶈兘淇敼涓烘櫘閫氱敤鎴�");
+ return AjaxResult.error("瀹跺涵鎴愬憳涓嶈兘淇敼涓烘櫘閫氱敤鎴�");
}
// zInfoUserService.update(infoUser);
--
Gitblit v1.9.1