修改bug

project_data/sql/0.1.0/soc/soc.sql

@@ -264,4 +264,6 @@ INSERT INTO `sys_config` (`config_name`, `config_key`, `config_value`, `config_t
 -- 修改菜单名称
 UPDATE sys_menu set menu_name ='视频监测' WHERE menu_name = '智能运维';
 -- 修改菜单名称: "来访"全局替换成"出入"
-UPDATE sys_menu SET menu_name = REPLACE(menu_name, '来访', '出入') where menu_name like '%来访%'
+UPDATE sys_menu SET menu_name = REPLACE(menu_name, '来访', '出入') where menu_name like '%来访%';
+-- 修改字典名称: "来访"全局替换成"出入"
+update sys_dict_data set dict_label='出入管理登记簿' where dict_type='register_book_type' and dict_label='来访管理登记簿' limit 1;

soc-common/soc-common-core/src/main/java/com/xunmei/common/core/enums/RegisterBookType.java

@@ -18,7 +18,7 @@ public enum RegisterBookType {
     SECURITY_PERFORMANCE(0, "安保履职登记簿"),
     EDUCATION_TRAINING(1, "教育培训登记簿"),
     SAFETY_DRILL(2, "预案演练登记簿"),
-    VISIT_RECORD(3, "来访管理登记簿"),
+    VISIT_RECORD(3, "出入管理登记簿"),
     ALARM_TEST(4, "110报警测试登记簿"),
     SELF_SERVICE_BANK(5, "备用电源维护登记簿"),
     BACKUP_POWER(6, "离行式自助银行巡检登记簿"),

soc-modules/soc-modules-file/src/main/java/com/xunmei/file/service/LocalSysFileServiceImpl.java

@@ -323,7 +323,7 @@ public class LocalSysFileServiceImpl implements ISysFileService {
         final BaseFont fs = pdfTableVo.getFs();
         final Font tableFont = pdfTableVo.getTableFont();
 
-        PdfUtil.dealHeader(document, fs, "监控调阅情况登记簿", 24);
+        PdfUtil.dealHeader(document, fs, RegisterBookType.MONITOR_ACCESS.getText(), 24);
         String checkTime = data.getTaskStartTime();
         String checkUser = data.getCheckUser();
 
@@ -389,7 +389,7 @@ public class LocalSysFileServiceImpl implements ISysFileService {
         final PdfPTable table = pdfTableVo.getTable();
         final BaseFont fs = pdfTableVo.getFs();
         final Font tableFont = pdfTableVo.getTableFont();
-        PdfUtil.dealHeader(document, fs, "来 访 管 理 登 记 簿", 24);
+        PdfUtil.dealHeader(document, fs, RegisterBookType.VISIT_RECORD.getText(), 24);
         PdfUtil.dealOutInBody(document, table, tableFont, data);
         document.close();
         writer.close();

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

@@ -1471,9 +1471,15 @@ public class SysOrgServiceImpl extends ServiceImpl<SysOrgMapper, SysOrg> impleme
     @Override
     public String concatOrgName(Long orgId) {
         SysOrg org = getById(orgId);
-        if (ObjectUtil.isEmpty(org)){
+        if (ObjectUtil.isNull(org)){
             return StringUtil.EMPTY_STRING;
         }
+        if (OrgTypeEnum.DIQU_HANG_SHE.getCode().equals(org.getType())){
+            return org.getShortName();
+        }
+        if (OrgTypeEnum.HANG_SHE.getCode().equals(org.getType())){
+            return org.getAffiliatedArea()+"-"+org.getShortName();
+        }
         return org.getAffiliatedArea()+"-"+org.getAffiliatedBank()+"-"+org.getShortName();
     }
 }