修改机构简称

soc-modules/soc-modules-core/src/main/java/com/xunmei/core/access/service/impl/TMonitoringRetrievalPlanServiceImpl.java

@@ -165,7 +165,7 @@ public class TMonitoringRetrievalPlanServiceImpl extends ServiceImpl<TMonitoring
             BeanUtils.copyProperties(tMonitoringRetrievalPlan, monitoringRetrievalPlan);
             monitoringRetrievalPlan.setPlanName(tMonitoringRetrievalPlan.getPlanName());
             monitoringRetrievalPlan.setOrgId(l.getId());
-            monitoringRetrievalPlan.setOrgName(l.getName());
+            monitoringRetrievalPlan.setOrgName(l.getShortName());
             monitoringRetrievalPlan.setRoleId(tMonitoringRetrievalPlan.getRoleId());
             monitoringRetrievalPlan.setRoleName(tMonitoringRetrievalPlan.getRoleName());
             monitoringRetrievalPlan.setOrgPath(l.getPath());
@@ -195,7 +195,7 @@ public class TMonitoringRetrievalPlanServiceImpl extends ServiceImpl<TMonitoring
                     BeanUtils.copyProperties(monitoringRetrievalPlan, plan);
                     plan.setPlanName(tMonitoringRetrievalPlan.getPlanName());
                     plan.setOrgId(s.getId());
-                    plan.setOrgName(s.getName());
+                    plan.setOrgName(s.getShortName());
                     plan.setRoleId(tMonitoringRetrievalPlan.getRoleId());
                     plan.setRoleName(tMonitoringRetrievalPlan.getRoleName());
                     plan.setOrgPath(s.getPath());
@@ -252,7 +252,7 @@ public class TMonitoringRetrievalPlanServiceImpl extends ServiceImpl<TMonitoring
         tMonitoringRetrievalPlan.setCreateTime(DateUtils.getNowDate());
         SysUser sysUser = remoteUserService.getUserById(SecurityUtils.getUserId(), SecurityConstants.INNER);
         SysOrg data = remoteOrgService.selectSysOrgById(sysUser.getOrgId(), SecurityConstants.INNER);
-        tMonitoringRetrievalPlan.setOrgName(data.getName());
+        tMonitoringRetrievalPlan.setOrgName(data.getShortName());
         tMonitoringRetrievalPlan.setOrgId(sysUser.getOrgId());
         tMonitoringRetrievalPlan.setCreateBy(SecurityUtils.getUsername());
         tMonitoringRetrievalPlan.setUpdateTime(DateUtils.getNowDate());
@@ -279,7 +279,7 @@ public class TMonitoringRetrievalPlanServiceImpl extends ServiceImpl<TMonitoring
                 TMonitoringRetrievalPlan monitoringRetrievalPlan = new TMonitoringRetrievalPlan();
                 BeanUtils.copyProperties(tMonitoringRetrievalPlan, monitoringRetrievalPlan);
                 monitoringRetrievalPlan.setOrgId(l.getId());
-                monitoringRetrievalPlan.setOrgName(l.getName());
+                monitoringRetrievalPlan.setOrgName(l.getShortName());
                 monitoringRetrievalPlan.setRoleId(tMonitoringRetrievalPlan.getRoleId());
                 monitoringRetrievalPlan.setRoleName(tMonitoringRetrievalPlan.getRoleName());
                 monitoringRetrievalPlan.setOrgPath(l.getPath());

soc-modules/soc-modules-system/src/main/java/com/xunmei/system/service/impl/SysNfcBindServiceImpl.java

@@ -138,7 +138,7 @@ public class SysNfcBindServiceImpl extends ServiceImpl<SysNfcBindMapper, SysNfcB
         sysNfcBind.setDelFlag("0");
         SysOrg sysOrg = sysOrgService.selectSysOrgById(sysNfcBind.getOrgId());
         if (null != sysOrg) {
-            sysNfcBind.setOrgName(sysOrg.getName());
+            sysNfcBind.setOrgName(sysOrg.getShortName());
         }
         SysAreaCheck areaCheck = sysAreaCheckService.selectSysAreaCheckById(sysNfcBind.getCheckId());
         if (null != areaCheck) {
@@ -172,7 +172,7 @@ public class SysNfcBindServiceImpl extends ServiceImpl<SysNfcBindMapper, SysNfcB
         sysNfcBind.setUpdateTime(DateUtils.getNowDate());
         SysOrg sysOrg = sysOrgService.selectSysOrgById(sysNfcBind.getOrgId());
         if (null != sysOrg) {
-            sysNfcBind.setOrgName(sysOrg.getName());
+            sysNfcBind.setOrgName(sysOrg.getShortName());
         }
         SysAreaCheck areaCheck = sysAreaCheckService.selectSysAreaCheckById(sysNfcBind.getCheckId());
         if (null != areaCheck) {

soc-modules/soc-modules-system/src/main/resources/mapper/system/SysAreaCheckMapper.xml

@@ -71,7 +71,7 @@
         SELECT
         sac.*,
         sa.`name` AS areaName,
-        so.`name` AS orgName
+        so.short_name AS orgName
         FROM
         sys_area_check sac
         LEFT JOIN sys_area sa ON sa.id = sac.area_id