From de1823591a01addd54cb1aab4d78397dcb020472 Mon Sep 17 00:00:00 2001
From: feige <791364011@qq.com>
Date: 星期一, 07 十月 2024 23:14:31 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
zhang-content/src/main/java/com/ruoyi/domain/ShareMore.java | 10 +++++
zhang-content/src/main/java/com/ruoyi/service/impl/ZInfoUserServiceImpl.java | 28 ++++++++++++++
ruoyi-common/src/main/java/com/ruoyi/common/utils/poi/ExcelUtil.java | 4 +
zhang-content/src/main/java/com/ruoyi/service/impl/ZfContactServiceImpl.java | 2 -
ruoyi-admin/src/main/java/com/ruoyi/web/controller/zhang/ZfDoctorShareController.java | 1
zhang-content/src/main/java/com/ruoyi/service/impl/ZfDoctorShareServiceImpl.java | 4 ++
ruoyi-admin/src/main/java/com/ruoyi/web/controller/zhang/ZInfoUserController.java | 9 ++++
ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysUserController.java | 13 +++++-
zhang-content/src/main/java/com/ruoyi/service/impl/ZfDoctorServiceImpl.java | 4 +-
zhang-content/src/main/java/com/ruoyi/domain/ShareOtherClan.java | 21 ++++++++++
zhang-content/src/main/java/com/ruoyi/service/ZInfoUserService.java | 2 +
11 files changed, 90 insertions(+), 8 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 9a29aca..5546b45 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
@@ -221,7 +221,7 @@
// infoUser.setFamilyId(mother.getFamilyId());
// }
if (user.getSpouseId() != null){
- if ( !zInfoUserService.getById(user.getUserId()).getSpouseId().equals(user.getSpouseId())){
+// if ( !zInfoUserService.getById(user.getUserId()).getSpouseId().equals(user.getSpouseId())){
//鏄湰瀹�
if (zInfoUserService.getById(user.getUserId()).getIsMyFamily() == 0) {
@@ -229,7 +229,7 @@
System.out.println("33333333333333333333333333333333333333333/");
infoUser.setFamilyId(spouse.getFamilyId());
infoUser.setClanId(spouse.getClanId());
- }
+// }
}}
if(infoUser.getFamilyId()!=null)
zInfoUserService.saveOrUpdate(infoUser);
@@ -242,6 +242,11 @@
ZInfoUser zu = new ZInfoUser();
zu.setUserId(user.getSpouseId());
zu.setSpouseId(infoUser.getUserId());
+ Long spouseMoM = zInfoUserService.getById(user.getSpouseId()).getMomId();
+ Long spouseDad = zInfoUserService.getById(user.getSpouseId()).getFatherId();
+ zu.setMomId(spouseMoM);
+ zu.setFatherId(spouseDad);
+
zInfoUserService.updateById(zu);
}
@@ -379,6 +384,10 @@
ZInfoUser zu = new ZInfoUser();
zu.setUserId(userAll.getSpouseId());
zu.setSpouseId(infoUser.getUserId());
+ Long spouseMoM = zInfoUserService.getById(userAll.getSpouseId()).getMomId();
+ Long spouseDad = zInfoUserService.getById(userAll.getSpouseId()).getFatherId();
+ zu.setMomId(spouseMoM);
+ zu.setFatherId(spouseDad);
zInfoUserService.updateById(zu);
}
}
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 344dd46..36f9b01 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
@@ -12,6 +12,7 @@
import com.ruoyi.common.utils.SecurityUtils;
import com.ruoyi.common.utils.ServletUtils;
import com.ruoyi.common.utils.poi.ExcelUtil;
+import com.ruoyi.domain.ShareMore;
import com.ruoyi.domain.ZInfoUser;
import com.ruoyi.domain.ZfDoctor;
import com.ruoyi.domain.ZfRelation;
@@ -380,6 +381,14 @@
return zInfoUserService.getInfoByfid(fid);
}
+ /**
+ // * 鍒嗕韩缁欏叾浠栧鏃忔暟鎹紝閫氳繃杈撳叆鍚嶅瓧鏌ユ壘鎵�鏈夌殑鍚屽悕鐢ㄦ埛鍜屽鏃忓彿
+ // */
+ @PostMapping("/byName")
+ public AjaxResult listByNickNameDate(@RequestBody ZInfoUser zInfoUser)
+ {
+ return zInfoUserService.findInfoUserNameAClan(zInfoUser.getNickName());
+ }
}
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/zhang/ZfDoctorShareController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/zhang/ZfDoctorShareController.java
index 604ee7f..cd26d0c 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/zhang/ZfDoctorShareController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/zhang/ZfDoctorShareController.java
@@ -38,7 +38,6 @@
zfDoctor.setSysMenuId(2019L);
return zfDoctorShareService.saveZa(zfDoctor);
}
-
/**
* 鏍规嵁UserId鍜屽垎浜汉shareId鏌ョ湅宸茬粡鎺堟潈缁欓偅浜涗汉閭ｄ簺鏁版嵁
*/
diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/utils/poi/ExcelUtil.java b/ruoyi-common/src/main/java/com/ruoyi/common/utils/poi/ExcelUtil.java
index 37ea80f..81c0188 100644
--- a/ruoyi-common/src/main/java/com/ruoyi/common/utils/poi/ExcelUtil.java
+++ b/ruoyi-common/src/main/java/com/ruoyi/common/utils/poi/ExcelUtil.java
@@ -1576,8 +1576,10 @@
for (int i = row.getFirstCellNum(); i < row.getLastCellNum(); i++)
{
Cell cell = row.getCell(i);
- if (cell != null && cell.getCellType() != CellType.BLANK)
+// System.out.println("11111111111111:/"+(cell != null)+"\n2222222222:/"+cell+"\n333333:/"+String.valueOf(cell).length());
+ if (cell != null && cell.getCellType() != CellType.BLANK && !cell.toString().equals(""))
{
+// System.out.println("444444+/"+(cell.getCellType()));
return false;
}
}
diff --git a/zhang-content/src/main/java/com/ruoyi/domain/ShareMore.java b/zhang-content/src/main/java/com/ruoyi/domain/ShareMore.java
index 02c59ef..7c14c7e 100644
--- a/zhang-content/src/main/java/com/ruoyi/domain/ShareMore.java
+++ b/zhang-content/src/main/java/com/ruoyi/domain/ShareMore.java
@@ -29,4 +29,14 @@
* 鍒嗕韩鐨勬ā鍧�
*/
private Long sysMenuId;
+
+ /**
+ * 鍒嗕韩涓叾浠栧鏃忚緭鍏ュ悕瀛�
+ */
+ private String nickName;
+
+ /**
+ * 鍒嗕韩缁欑殑鐢ㄦ埛鐨勫鏃�
+ */
+ private Integer clanId;
}
diff --git a/zhang-content/src/main/java/com/ruoyi/domain/ShareOtherClan.java b/zhang-content/src/main/java/com/ruoyi/domain/ShareOtherClan.java
new file mode 100644
index 0000000..a52ccb7
--- /dev/null
+++ b/zhang-content/src/main/java/com/ruoyi/domain/ShareOtherClan.java
@@ -0,0 +1,21 @@
+package com.ruoyi.domain;
+
+import lombok.Data;
+
+@Data
+public class ShareOtherClan {
+ /**
+ * 鍒嗕韩缁欑殑閭ｄ釜浜虹殑id
+ */
+ private Integer userId;
+
+ /**
+ * 鍒嗕韩缁欑殑閭ｄ釜浜虹殑鍚嶅瓧
+ */
+ private String nickName;
+
+ /**
+ * 鍒嗕韩缁欑殑閭ｄ釜浜虹殑瀹舵棌id
+ */
+ private Integer clanId;
+}
diff --git a/zhang-content/src/main/java/com/ruoyi/service/ZInfoUserService.java b/zhang-content/src/main/java/com/ruoyi/service/ZInfoUserService.java
index 48db369..398efc6 100644
--- a/zhang-content/src/main/java/com/ruoyi/service/ZInfoUserService.java
+++ b/zhang-content/src/main/java/com/ruoyi/service/ZInfoUserService.java
@@ -26,6 +26,8 @@
List<ZInfoUser> selectByClanId(Integer clanId);
+ AjaxResult findInfoUserNameAClan(String nickName);
+
List<ZInfoUser> getDataBySex(Integer sex,Integer clanId);
public ZInfoUser getInfoBysysId(Long sysid);
diff --git a/zhang-content/src/main/java/com/ruoyi/service/impl/ZInfoUserServiceImpl.java b/zhang-content/src/main/java/com/ruoyi/service/impl/ZInfoUserServiceImpl.java
index af92718..dabcdb4 100644
--- a/zhang-content/src/main/java/com/ruoyi/service/impl/ZInfoUserServiceImpl.java
+++ b/zhang-content/src/main/java/com/ruoyi/service/impl/ZInfoUserServiceImpl.java
@@ -91,6 +91,34 @@
return list(lqw);
}
+
+// public List<ZInfoUser> selectByNickName(String nickName){
+// ZInfoUser zInfoUser = new ZInfoUser();
+// zInfoUser.setNickName(nickName);
+// LambdaQueryWrapper<ZInfoUser> lqw = buildCondition(zInfoUser);
+// return list(lqw);
+// }
+
+ @Override
+ public AjaxResult findInfoUserNameAClan(String nickName)
+ {
+ ZInfoUser zInfoUser = new ZInfoUser();
+ zInfoUser.setNickName(nickName);
+
+ LambdaQueryWrapper<ZInfoUser> lqw = buildCondition(zInfoUser);
+ List<ZInfoUser> zInfoUsers = list(lqw);
+ List<ShareOtherClan> shareOtherClans = new ArrayList<>();
+
+ for (ZInfoUser zInfoUser1: zInfoUsers) {
+ ShareOtherClan shareOtherClan = new ShareOtherClan();
+ shareOtherClan.setNickName(zInfoUser1.getNickName());
+ shareOtherClan.setUserId(zInfoUser1.getUserId().intValue());
+ shareOtherClan.setClanId(zInfoUser1.getClanId());
+ shareOtherClans.add(shareOtherClan);
+ }
+ return AjaxResult.success(shareOtherClans);
+ }
+
@Override
public ZInfoUser getInfoBysysId(Long sysid) {
LambdaQueryWrapper<ZInfoUser> lqw = new LambdaQueryWrapper<>();
diff --git a/zhang-content/src/main/java/com/ruoyi/service/impl/ZfContactServiceImpl.java b/zhang-content/src/main/java/com/ruoyi/service/impl/ZfContactServiceImpl.java
index ec47aab..429131d 100644
--- a/zhang-content/src/main/java/com/ruoyi/service/impl/ZfContactServiceImpl.java
+++ b/zhang-content/src/main/java/com/ruoyi/service/impl/ZfContactServiceImpl.java
@@ -450,9 +450,7 @@
log.info("鏁版嵁鍒楄〃涓猴細{}", dataList);
for (ZfContact zfContact : dataList) {
- if (zfContact.getNickName().length() != 0 && zfContact.getName().length() != 0 && zfContact.getMyName().length() != 0 ) {
zfContactService.addData(zfContact);
- }
}
return AjaxResult.success("瀵煎叆鏁版嵁鎴愬姛");
diff --git a/zhang-content/src/main/java/com/ruoyi/service/impl/ZfDoctorServiceImpl.java b/zhang-content/src/main/java/com/ruoyi/service/impl/ZfDoctorServiceImpl.java
index 3367b37..b55db11 100644
--- a/zhang-content/src/main/java/com/ruoyi/service/impl/ZfDoctorServiceImpl.java
+++ b/zhang-content/src/main/java/com/ruoyi/service/impl/ZfDoctorServiceImpl.java
@@ -158,7 +158,7 @@
for (ZfDoctor zfDoctor : dataList) {
- if (zfDoctor.getSuitable().length() != 0 || zfDoctor.getType().length() != 0 || zfDoctor.getEffect().length() != 0 ) {
+// if (zfDoctor.getSuitable().length() != 0 || zfDoctor.getType().length() != 0 || zfDoctor.getEffect().length() != 0 ) {
if(zfDoctor.getSymptom().length() == 0 || zfDoctor.getSymptom() == null){
throw new RuntimeException("鐥囩姸涓虹┖锛屽鍏ユ暟鎹け璐�");
}
@@ -166,7 +166,7 @@
zfDoctorService.addData(zfDoctor);
}
}
- }
+// }
return AjaxResult.success("瀵煎叆鏁版嵁鎴愬姛");
}
diff --git a/zhang-content/src/main/java/com/ruoyi/service/impl/ZfDoctorShareServiceImpl.java b/zhang-content/src/main/java/com/ruoyi/service/impl/ZfDoctorShareServiceImpl.java
index 67321b1..96d6a4f 100644
--- a/zhang-content/src/main/java/com/ruoyi/service/impl/ZfDoctorShareServiceImpl.java
+++ b/zhang-content/src/main/java/com/ruoyi/service/impl/ZfDoctorShareServiceImpl.java
@@ -40,6 +40,9 @@
lqw.eq(StringUtils.isNotEmpty(String.valueOf(zfShare.getSysMenuId())), ZfShare::getSysMenuId, zfShare.getSysMenuId());
return lqw;
}
+
+
+
@Override
public List<ZfShare> getAuthority() {
SysUser user = SecurityUtils.getLoginUser().getUser();
@@ -51,6 +54,7 @@
return list(lqw);
}
+
@Resource
ZfDoctorShareService zfDoctorShareService;
--
Gitblit v1.9.1