From f260f74f208c027b92ecd15884f4c70a7e6e6991 Mon Sep 17 00:00:00 2001 From: "1378012178@qq.com" <1378012178@qq.com> Date: Tue, 25 Nov 2025 15:59:38 +0800 Subject: [PATCH] =?UTF-8?q?=E8=A7=A3=E5=86=B3=E6=A0=B9=E6=8D=AEnuid?= =?UTF-8?q?=E6=9F=A5=E8=AF=A2=E6=8A=A4=E7=90=86=E5=8D=95=E5=85=83=E4=BF=A1?= =?UTF-8?q?=E6=81=AF=E6=8E=A5=E5=8F=A3=EF=BC=9A=E8=B0=83=E6=95=B4=E6=9F=A5?= =?UTF-8?q?=E8=AF=A2=E6=96=B9=E5=BC=8F=EF=BC=8C=E8=A7=A3=E5=86=B3=E4=B8=8D?= =?UTF-8?q?=E5=90=8C=E5=BA=93=E7=9B=B8=E5=90=8C=E8=A1=A8=E5=AD=97=E6=AE=B5?= =?UTF-8?q?=E4=B8=8D=E4=B8=80=E8=87=B4=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../NuEmployeesAdvisoryInfoServiceImpl.java | 2 +- .../listener/EmployeesMQListener.java | 2 +- .../com/nu/modules/common/NuCommonApi.java | 2 +- .../com/nu/modules/common/SysBaseInfoApi.java | 6 +-- .../nu/modules/wechat/elder/api/ElderApi.java | 2 +- .../service/impl/ElderTagServiceImpl.java | 2 +- .../ConfigServiceDirectiveServiceImpl.java | 2 +- .../jeecg/common/system/api/ISysBaseAPI.java | 2 +- .../system/service/impl/SysBaseApiImpl.java | 46 ++++++++++--------- 9 files changed, 35 insertions(+), 31 deletions(-) diff --git a/nursing-unit-admin/nu-admin-biz/src/main/java/com/nu/modules/employees/service/impl/NuEmployeesAdvisoryInfoServiceImpl.java b/nursing-unit-admin/nu-admin-biz/src/main/java/com/nu/modules/employees/service/impl/NuEmployeesAdvisoryInfoServiceImpl.java index 573a4da..a209dc3 100644 --- a/nursing-unit-admin/nu-admin-biz/src/main/java/com/nu/modules/employees/service/impl/NuEmployeesAdvisoryInfoServiceImpl.java +++ b/nursing-unit-admin/nu-admin-biz/src/main/java/com/nu/modules/employees/service/impl/NuEmployeesAdvisoryInfoServiceImpl.java @@ -162,7 +162,7 @@ public class NuEmployeesAdvisoryInfoServiceImpl extends ServiceImpl data = new HashMap<>(); - com.alibaba.fastjson.JSONObject orgInfo = sysBaseAPI.getOrgInfo(dto.getOrgCode()); + com.alibaba.fastjson.JSONObject orgInfo = sysBaseAPI.getOrgInfo(dto.getOrgCode(), null); String companyName = orgInfo.getString("departName"); String content = companyName + "审核结果"; String auditStatus = ""; diff --git a/nursing-unit-admin/nu-admin-biz/src/main/java/com/nu/mq/employees/listener/EmployeesMQListener.java b/nursing-unit-admin/nu-admin-biz/src/main/java/com/nu/mq/employees/listener/EmployeesMQListener.java index cf070b2..5e6b98b 100644 --- a/nursing-unit-admin/nu-admin-biz/src/main/java/com/nu/mq/employees/listener/EmployeesMQListener.java +++ b/nursing-unit-admin/nu-admin-biz/src/main/java/com/nu/mq/employees/listener/EmployeesMQListener.java @@ -306,7 +306,7 @@ public class EmployeesMQListener { employeesOrgService.save(employeesOrg); //增加机构邀请员工的消息通知 - JSONObject orgInfo = sysBaseAPI.getOrgInfo(dto.getOrgCode()); + JSONObject orgInfo = sysBaseAPI.getOrgInfo(dto.getOrgCode(), null); String departName = orgInfo.getString("departName"); NuWxNoticeEntity nuWxNotice = new NuWxNoticeEntity(); nuWxNotice.setOpenId(dto.getOpenId()); diff --git a/nursing-unit-api/src/main/java/com/nu/modules/common/NuCommonApi.java b/nursing-unit-api/src/main/java/com/nu/modules/common/NuCommonApi.java index da43ade..d076bf3 100644 --- a/nursing-unit-api/src/main/java/com/nu/modules/common/NuCommonApi.java +++ b/nursing-unit-api/src/main/java/com/nu/modules/common/NuCommonApi.java @@ -31,7 +31,7 @@ public class NuCommonApi { */ @GetMapping("/getOrgInfo") public Result getOrgInfo(@RequestParam("orgCode") String orgCode) { - return Result.ok(sysBaseAPI.getOrgInfo(orgCode)); + return Result.ok(sysBaseAPI.getOrgInfo(orgCode, null)); } //获取标准指令库机构信息 diff --git a/nursing-unit-api/src/main/java/com/nu/modules/common/SysBaseInfoApi.java b/nursing-unit-api/src/main/java/com/nu/modules/common/SysBaseInfoApi.java index b8735d8..4d01eaf 100644 --- a/nursing-unit-api/src/main/java/com/nu/modules/common/SysBaseInfoApi.java +++ b/nursing-unit-api/src/main/java/com/nu/modules/common/SysBaseInfoApi.java @@ -49,7 +49,7 @@ public class SysBaseInfoApi { */ @GetMapping("/getOrgUrlByOrgCode") public Result getOrgUrlByOrgCode(@RequestParam("orgCode") String orgCode) { - JSONObject deptInfo = sysBaseAPI.getOrgInfo(orgCode); + JSONObject deptInfo = sysBaseAPI.getOrgInfo(orgCode, null); Map result = Maps.newHashMap(); String url = deptInfo.getString("url"); result.put("url", url.endsWith("/") ? url.substring(0, url.length() - 1) : url); @@ -63,7 +63,7 @@ public class SysBaseInfoApi { */ @GetMapping("/getMediaUrlByOrgCode") public Result getMediaUrlByOrgCode(@RequestParam("orgCode") String orgCode) { - JSONObject deptInfo = sysBaseAPI.getOrgInfo(orgCode); + JSONObject deptInfo = sysBaseAPI.getOrgInfo(orgCode, null); Map result = Maps.newHashMap(); String mediaUrl = deptInfo.getString("mediaUrl"); result.put("mediaUrl", mediaUrl.endsWith("/") ? mediaUrl : mediaUrl + "/"); @@ -77,7 +77,7 @@ public class SysBaseInfoApi { */ @GetMapping("/getOrgApiAddress") public Result getOrgInfo(@RequestParam("orgCode") String orgCode) { - JSONObject deptInfo = sysBaseAPI.getOrgInfo(orgCode); + JSONObject deptInfo = sysBaseAPI.getOrgInfo(orgCode, null); Map result = Maps.newHashMap(); String fullPath = ""; String url = deptInfo.getString("url"); diff --git a/nursing-unit-api/src/main/java/com/nu/modules/wechat/elder/api/ElderApi.java b/nursing-unit-api/src/main/java/com/nu/modules/wechat/elder/api/ElderApi.java index ba4e8d7..eb86747 100644 --- a/nursing-unit-api/src/main/java/com/nu/modules/wechat/elder/api/ElderApi.java +++ b/nursing-unit-api/src/main/java/com/nu/modules/wechat/elder/api/ElderApi.java @@ -194,7 +194,7 @@ public class ElderApi { DynamicDataSourceContextHolder.push(orgCode); JSONObject orgInfo = null; try { - orgInfo = sysBaseAPI.getOrgInfo(orgCode); + orgInfo = sysBaseAPI.getOrgInfo(orgCode,"payable_amount"); } finally { DynamicDataSourceContextHolder.clear(); } diff --git a/nursing-unit-elder/nu-elder-biz/src/main/java/com/nu/modules/eldertag/service/impl/ElderTagServiceImpl.java b/nursing-unit-elder/nu-elder-biz/src/main/java/com/nu/modules/eldertag/service/impl/ElderTagServiceImpl.java index 4347ad1..96cfca7 100644 --- a/nursing-unit-elder/nu-elder-biz/src/main/java/com/nu/modules/eldertag/service/impl/ElderTagServiceImpl.java +++ b/nursing-unit-elder/nu-elder-biz/src/main/java/com/nu/modules/eldertag/service/impl/ElderTagServiceImpl.java @@ -46,7 +46,7 @@ public class ElderTagServiceImpl extends ServiceImpl i @DS("dataSourceCode") @Override public JSONObject getDeptInfo(String dataSourceCode, String orgCode) { - return sysBaseAPI.getOrgInfo(orgCode); + return sysBaseAPI.getOrgInfo(orgCode, null); } /** diff --git a/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/servicedirective/service/impl/ConfigServiceDirectiveServiceImpl.java b/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/servicedirective/service/impl/ConfigServiceDirectiveServiceImpl.java index 1a7af01..a19857d 100644 --- a/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/servicedirective/service/impl/ConfigServiceDirectiveServiceImpl.java +++ b/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/servicedirective/service/impl/ConfigServiceDirectiveServiceImpl.java @@ -546,7 +546,7 @@ public class ConfigServiceDirectiveServiceImpl extends ServiceImpl queryCategoryByPid(String pid) { QueryWrapper qw = new QueryWrapper<>(); - qw.eq("pid",pid); + qw.eq("pid", pid); //专门解决获取行政区排序问题的 qw.orderByAsc("first_letter"); List list = categoryMapper.selectList(qw); @@ -1892,16 +1893,16 @@ public class SysBaseApiImpl implements ISysBaseAPI { @Override public JSONObject getOrgInfoByNuId(String nuId) { - if(StringUtils.isBlank(nuId)){ + if (StringUtils.isBlank(nuId)) { return null; } - String orgCode = nuId.substring(4, nuId.length()-3); - return queryOrgInfo(orgCode); + String orgCode = nuId.substring(4, nuId.length() - 3); + return queryOrgInfo(orgCode, null); } @Override - public JSONObject getOrgInfo(String orgCode) { - return queryOrgInfo(orgCode); + public JSONObject getOrgInfo(String orgCode, String selectFileds) { + return queryOrgInfo(orgCode, selectFileds); } @Override @@ -1934,31 +1935,34 @@ public class SysBaseApiImpl implements ISysBaseAPI { @Override public JSONObject getDeptInfo() { - Map map = Maps.newHashMap(); + Map map = Maps.newHashMap(); QueryWrapper qw = new QueryWrapper<>(); - qw.eq("org_category","1"); - qw.eq("del_flag","0"); - qw.eq("org_code","100"); + qw.eq("org_category", "1"); + qw.eq("del_flag", "0"); + qw.eq("org_code", "100"); List list = sysDepartService.list(qw); - if(list!=null && !list.isEmpty()){ - map.put("code",list.get(0).getOrgCode()); - map.put("name",list.get(0).getDepartName()); - map.put("url",list.get(0).getUrl()); - map.put("contextPath",list.get(0).getContextPath()); - map.put("izDirectiveMain",list.get(0).getIzDirectiveMain()); - map.put("izElderTagMain",list.get(0).getIzElderTagMain()); - map.put("mediaUrl",list.get(0).getMediaUrl()); + if (list != null && !list.isEmpty()) { + map.put("code", list.get(0).getOrgCode()); + map.put("name", list.get(0).getDepartName()); + map.put("url", list.get(0).getUrl()); + map.put("contextPath", list.get(0).getContextPath()); + map.put("izDirectiveMain", list.get(0).getIzDirectiveMain()); + map.put("izElderTagMain", list.get(0).getIzElderTagMain()); + map.put("mediaUrl", list.get(0).getMediaUrl()); } return new JSONObject(map); } @Nullable - private JSONObject queryOrgInfo(String orgCode) { + private JSONObject queryOrgInfo(String orgCode, String selectFileds) { QueryWrapper qw = new QueryWrapper<>(); qw.eq("org_code", orgCode);//机构编码 qw.eq("org_category", "1");//机构类型 qw.eq("del_flag", "0");//未删除数据 + if (StringUtils.isNotBlank(selectFileds)) { + qw.select(selectFileds.split(",")); + } SysDepart sysDepart = sysDepartService.getOne(qw); if (sysDepart != null) { return (JSONObject) JSONObject.toJSON(sysDepart); @@ -1970,7 +1974,7 @@ public class SysBaseApiImpl implements ISysBaseAPI { @Override public Object queryAreaNameById(String id) { QueryWrapper qw = new QueryWrapper<>(); - qw.eq("id",id); + qw.eq("id", id); return categoryMapper.selectOne(qw); } @@ -1986,7 +1990,7 @@ public class SysBaseApiImpl implements ISysBaseAPI { public SysDepartModel selectDepartById(String id) { SysDepart depart = sysDepartService.getDepartById(id); SysDepartModel sysDepartModel = new SysDepartModel(); - if(depart!=null){ + if (depart != null) { BeanUtils.copyProperties(depart, sysDepartModel); } return sysDepartModel;