参考预案演练库 保存时保存机构简称 列表显示机构名称

soc-common/soc-common-core/src/main/java/com/xunmei/common/core/domain/drill/vo/CoreDrillDictionaryPageVo.java

@@ -19,6 +19,12 @@ public class CoreDrillDictionaryPageVo {
     @JsonSerialize(using = ToStringSerializer.class)
     private Long id;
 
+    @ApiModelProperty(value = "参考演练创建机构")
+    private String orgId;
+
+    @ApiModelProperty(value = "机构名称")
+    private String orgName;
+
     @ApiModelProperty(value = "演练类型,字典表关联取值")
     private String drillType;
     @ApiModelProperty(value = "演练类型名称")

soc-modules/soc-modules-core/src/main/java/com/xunmei/core/drill/controller/CoreDrillDictionaryController.java

@@ -47,7 +47,7 @@ public class CoreDrillDictionaryController extends BaseController {
      * 获取预案演练库详细信息
      */
     @ApiOperation(value = "获取CoreDrillDictionary详细信息")
-    @RequiresPermissions("core:drillDictionary:query")
+    @RequiresPermissions("core:drillDictionary:edit")
     @GetMapping(value = "/{id}")
     public AjaxResult getInfo(@PathVariable("id") Long id) {
         return success(coreDrillDictionaryService.selectCoreDrillDictionaryById(id));

soc-modules/soc-modules-core/src/main/java/com/xunmei/core/drill/service/impl/CoreDrillDictionaryServiceImpl.java

@@ -101,7 +101,7 @@ public class CoreDrillDictionaryServiceImpl extends ServiceImpl<CoreDrillDiction
             drillTypeDictList.stream().filter(dict -> ObjectUtil.equal(dict.getDictValue(), request.getDrillType())).findFirst().ifPresent(dict -> dictionary.setDrillTypeName(dict.getDictLabel()));
         }
         SysOrg sysOrg = getOrg(request.getOrgId());
-        dictionary.setOrgName(sysOrg.getName());
+        dictionary.setOrgName(sysOrg.getShortName());
         dictionary.setOrgPath(sysOrg.getPath());
         dictionary.setOrgId(sysOrg.getId());
         dictionary.setCreateBy(SecurityUtils.getUserId().toString());