解决根据nuid查询护理单元信息接口：调整查询方式，解决不同库相同表字段不一致问题

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<NuEmployeesA
             String page = "pages/index/index"; // 点击消息跳转的页面
 
             Map<String, Object> 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 = "";

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());

nursing-unit-api/src/main/java/com/nu/modules/common/NuCommonApi.java

@@ -31,7 +31,7 @@ public class NuCommonApi {
      */
     @GetMapping("/getOrgInfo")
     public Result<JSONObject> getOrgInfo(@RequestParam("orgCode") String orgCode) {
-        return Result.ok(sysBaseAPI.getOrgInfo(orgCode));
+        return Result.ok(sysBaseAPI.getOrgInfo(orgCode, null));
     }
 
     //获取标准指令库机构信息

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<String, Object> 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<String, Object> 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<String, Object> result = Maps.newHashMap();
         String fullPath = "";
         String url = deptInfo.getString("url");

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();
         }

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<ElderTagMapper, ElderTag> i
     @DS("dataSourceCode")
     @Override
     public JSONObject getDeptInfo(String dataSourceCode, String orgCode) {
-        return sysBaseAPI.getOrgInfo(orgCode);
+        return sysBaseAPI.getOrgInfo(orgCode, null);
     }
 
     /**

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<ConfigService
     @DS("dataSourceCode")
     @Override
     public JSONObject getDeptInfo(String dataSourceCode, String orgCode) {
-        return sysBaseAPI.getOrgInfo(orgCode);
+        return sysBaseAPI.getOrgInfo(orgCode, null);
     }
 
     @Override

nursing-unit-system/nu-system-api/nu-system-local-api/src/main/java/org/jeecg/common/system/api/ISysBaseAPI.java

@@ -625,7 +625,7 @@ public interface ISysBaseAPI extends CommonAPI {
 
     JSONObject getOrgInfoByNuId(String nuId);
 
-    JSONObject getOrgInfo(String orgCode);
+    JSONObject getOrgInfo(String orgCode, String selectFileds);
 
     JSONObject getDMOrgInfo();
 

nursing-unit-system/nu-system-biz/src/main/java/org/jeecg/modules/system/service/impl/SysBaseApiImpl.java

@@ -718,6 +718,7 @@ public class SysBaseApiImpl implements ISysBaseAPI {
 
     /**
      * 不要改排序 排序固定用first_letter asc
+     *
      * @param pid
      * @return
      */
@@ -1896,12 +1897,12 @@ public class SysBaseApiImpl implements ISysBaseAPI {
             return null;
         }
         String orgCode = nuId.substring(4, nuId.length() - 3);
-        return queryOrgInfo(orgCode);
+        return queryOrgInfo(orgCode, null);
     }
 
     @Override
-    public JSONObject getOrgInfo(String orgCode) {
+    public JSONObject getOrgInfo(String orgCode, String selectFileds) {
-        return queryOrgInfo(orgCode);
+        return queryOrgInfo(orgCode, selectFileds);
     }
 
     @Override
@@ -1954,11 +1955,14 @@ public class SysBaseApiImpl implements ISysBaseAPI {
     }
 
     @Nullable
-    private JSONObject queryOrgInfo(String orgCode) {
+    private JSONObject queryOrgInfo(String orgCode, String selectFileds) {
         QueryWrapper<SysDepart> 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);