From 4a794ce30bde3f700ee9ee684e8c273ce8117c64 Mon Sep 17 00:00:00 2001
From: yangjun <1173114630@qq.com>
Date: Fri, 10 Apr 2026 14:42:41 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=9F=A5=E8=AF=A2=E6=9D=A1?=
 =?UTF-8?q?=E4=BB=B6=E4=B8=8D=E5=A5=BD=E4=BD=BF=E7=9A=84=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../modules/baseinfo/service/impl/NuBaseInfoServiceImpl.java | 3 +++
 .../controller/NuEmployeesAdvisoryInfoController.java        | 5 +++++
 .../nu/modules/elderinfo/controller/ElderInfoController.java | 4 ++++
 .../jeecg/modules/system/controller/SysDepartController.java | 3 +++
 .../main/java/org/jeecg/modules/system/entity/SysDepart.java | 2 ++
 5 files changed, 17 insertions(+)

diff --git a/nursing-unit-admin/nu-admin-biz/src/main/java/com/nu/modules/baseinfo/service/impl/NuBaseInfoServiceImpl.java b/nursing-unit-admin/nu-admin-biz/src/main/java/com/nu/modules/baseinfo/service/impl/NuBaseInfoServiceImpl.java
index b3fd4f7..41fdf7d 100644
--- a/nursing-unit-admin/nu-admin-biz/src/main/java/com/nu/modules/baseinfo/service/impl/NuBaseInfoServiceImpl.java
+++ b/nursing-unit-admin/nu-admin-biz/src/main/java/com/nu/modules/baseinfo/service/impl/NuBaseInfoServiceImpl.java
@@ -90,6 +90,9 @@ public class NuBaseInfoServiceImpl extends ServiceImpl<NuBaseInfoMapper, NuBaseI
             String dbStr = "";//电表集合
             String sbStr = "";//水表集合
             String wsdjStr = "";//温湿度计集合
+            if(wlsbList == null){
+                continue;
+            }
             for (NuBaseInfo wlsb : wlsbList) {
                 if (info.getNuId().equals(wlsb.getNuId())) {
                     if ("1".equals(wlsb.getDeviceType())) {
diff --git a/nursing-unit-admin/nu-admin-biz/src/main/java/com/nu/modules/employees/controller/NuEmployeesAdvisoryInfoController.java b/nursing-unit-admin/nu-admin-biz/src/main/java/com/nu/modules/employees/controller/NuEmployeesAdvisoryInfoController.java
index 1530113..b069c60 100644
--- a/nursing-unit-admin/nu-admin-biz/src/main/java/com/nu/modules/employees/controller/NuEmployeesAdvisoryInfoController.java
+++ b/nursing-unit-admin/nu-admin-biz/src/main/java/com/nu/modules/employees/controller/NuEmployeesAdvisoryInfoController.java
@@ -3,6 +3,8 @@ package com.nu.modules.employees.controller;
 import java.util.Arrays;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
+
+import org.apache.commons.lang.StringUtils;
 import org.jeecg.common.api.vo.Result;
 import org.jeecg.common.system.query.QueryGenerator;
 import com.nu.modules.employees.entity.NuEmployeesAdvisoryInfo;
@@ -65,6 +67,9 @@ public class NuEmployeesAdvisoryInfoController extends JeecgController<NuEmploye
 																 @RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
 																 HttpServletRequest req) {
 		 QueryWrapper<NuEmployeesAdvisoryInfo> queryWrapper = QueryGenerator.initQueryWrapper(nuEmployeesAdvisoryInfo, req.getParameterMap());
+		 if(StringUtils.isNotBlank(nuEmployeesAdvisoryInfo.getOrgCode())){
+			 queryWrapper.eq("org_code", nuEmployeesAdvisoryInfo.getOrgCode());
+		 }
 		 Page<NuEmployeesAdvisoryInfo> page = new Page<NuEmployeesAdvisoryInfo>(pageNo, pageSize);
 		 IPage<NuEmployeesAdvisoryInfo> pageList = nuEmployeesAdvisoryInfoService.getTjList(page, queryWrapper);
 		 return Result.OK(pageList);
diff --git a/nursing-unit-elder/nu-elder-biz/src/main/java/com/nu/modules/elderinfo/controller/ElderInfoController.java b/nursing-unit-elder/nu-elder-biz/src/main/java/com/nu/modules/elderinfo/controller/ElderInfoController.java
index bf0fb75..8b104bf 100644
--- a/nursing-unit-elder/nu-elder-biz/src/main/java/com/nu/modules/elderinfo/controller/ElderInfoController.java
+++ b/nursing-unit-elder/nu-elder-biz/src/main/java/com/nu/modules/elderinfo/controller/ElderInfoController.java
@@ -8,6 +8,7 @@ import com.nu.modules.elderinfo.service.IElderInfoService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.lang.StringUtils;
 import org.jeecg.common.api.vo.Result;
 import org.jeecg.common.system.base.controller.JeecgController;
 import org.jeecg.common.system.query.QueryGenerator;
@@ -47,6 +48,9 @@ public class ElderInfoController extends JeecgController<ElderInfo, IElderInfoSe
     @GetMapping(value = "/getElderTjList")
     public Result<IPage<ElderInfo>> getElderTjList(ElderInfo elderInfo, @RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo, @RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize, HttpServletRequest req) {
         QueryWrapper<ElderInfo> queryWrapper = QueryGenerator.initQueryWrapper(elderInfo, req.getParameterMap());
+        if(StringUtils.isNotBlank(elderInfo.getSysOrgCode())){
+            queryWrapper.eq("sys_org_code", elderInfo.getSysOrgCode());
+        }
         Page<ElderInfo> page = new Page<ElderInfo>(pageNo, pageSize);
         IPage<ElderInfo> pageList = elderInfoService.getElderTjList(page, queryWrapper);
         return Result.OK(pageList);
diff --git a/nursing-unit-system/nu-system-biz/src/main/java/org/jeecg/modules/system/controller/SysDepartController.java b/nursing-unit-system/nu-system-biz/src/main/java/org/jeecg/modules/system/controller/SysDepartController.java
index 79b67ce..25bb250 100644
--- a/nursing-unit-system/nu-system-biz/src/main/java/org/jeecg/modules/system/controller/SysDepartController.java
+++ b/nursing-unit-system/nu-system-biz/src/main/java/org/jeecg/modules/system/controller/SysDepartController.java
@@ -781,6 +781,9 @@ public class SysDepartController {
                           HttpServletRequest req) {
         QueryWrapper<SysDepart> queryWrapper = QueryGenerator.initQueryWrapper(sysDepart, req.getParameterMap());
         Page<SysDepart> page = new Page<>(pageNo, pageSize);
+        if(StringUtils.isNotBlank(sysDepart.getTitle())){
+            queryWrapper.apply("(depart_name like '%"+sysDepart.getTitle()+"%' or org_leader like '"+sysDepart.getTitle()+"' or org_leader_phone like '%"+sysDepart.getTitle()+"%')");
+        }
         IPage<SysDepart> pageList = sysDepartService.page(page, queryWrapper);
         return Result.ok(pageList);
     }
diff --git a/nursing-unit-system/nu-system-biz/src/main/java/org/jeecg/modules/system/entity/SysDepart.java b/nursing-unit-system/nu-system-biz/src/main/java/org/jeecg/modules/system/entity/SysDepart.java
index aaa1ef0..3b667a0 100644
--- a/nursing-unit-system/nu-system-biz/src/main/java/org/jeecg/modules/system/entity/SysDepart.java
+++ b/nursing-unit-system/nu-system-biz/src/main/java/org/jeecg/modules/system/entity/SysDepart.java
@@ -522,6 +522,8 @@ public class SysDepart implements Serializable {
      */
     @TableField(exist = false)
     private String oldDirectorUserIds;
+    @TableField(exist = false)
+    private String title;
     //update-end---author:wangshuai ---date:20200308  for：[JTC-119]新增字段负责人ids和旧的负责人ids