Przeglądaj źródła

修复若干BUG

wangliang 2 lat temu
rodzic
commit
e2db6d4c61

+ 5 - 0
distributed-print-business/src/main/java/com/qmth/distributed/print/business/bean/result/CustomPrivilegeResult.java

@@ -28,6 +28,11 @@ public class CustomPrivilegeResult implements Serializable {
 
 
     }
     }
 
 
+    public CustomPrivilegeResult(List<PrivilegeDto> customPrivilegeList, List<String> sysPdfSize) {
+        this.customPrivilegeList = customPrivilegeList;
+        this.sysPdfSize = sysPdfSize;
+    }
+
     public CustomPrivilegeResult(List<PrivilegeDto> customPrivilegeList, List<String> sysPdfSize, boolean accountSmsVerify) {
     public CustomPrivilegeResult(List<PrivilegeDto> customPrivilegeList, List<String> sysPdfSize, boolean accountSmsVerify) {
         this.customPrivilegeList = customPrivilegeList;
         this.customPrivilegeList = customPrivilegeList;
         this.sysPdfSize = sysPdfSize;
         this.sysPdfSize = sysPdfSize;

+ 1 - 2
distributed-print/src/main/java/com/qmth/distributed/print/api/MenuCustomController.java

@@ -72,8 +72,7 @@ public class MenuCustomController {
         List<PrivilegeDto> customPrivilegeList = sysPrivilegeService.addCustomList();
         List<PrivilegeDto> customPrivilegeList = sysPrivilegeService.addCustomList();
         SysConfig sysConfig = commonCacheService.addSysConfigCache(SystemConstant.SYS_PDF_SIZE_LIST);
         SysConfig sysConfig = commonCacheService.addSysConfigCache(SystemConstant.SYS_PDF_SIZE_LIST);
         Optional.ofNullable(sysConfig).orElseThrow(() -> ExceptionResultEnum.ERROR.exception("未配置全局pdf格式清单"));
         Optional.ofNullable(sysConfig).orElseThrow(() -> ExceptionResultEnum.ERROR.exception("未配置全局pdf格式清单"));
-        SysConfig sysConfigAccount = commonCacheService.addSysConfigCache(SystemConstant.ACCOUNT_SMS_VERIFY);
-        return ResultUtil.ok(new CustomPrivilegeResult(customPrivilegeList, Arrays.asList(sysConfig.getConfigValue().replaceAll("\\[", "").replaceAll("\\]", "").split(", ")), Objects.nonNull(sysConfigAccount) ? Boolean.valueOf(sysConfigAccount.getConfigValue()) : false));
+        return ResultUtil.ok(new CustomPrivilegeResult(customPrivilegeList, Arrays.asList(sysConfig.getConfigValue().replaceAll("\\[", "").replaceAll("\\]", "").split(", "))));
     }
     }
 
 
     @ApiOperation(value = "学校新增/修改自定义菜单权限")
     @ApiOperation(value = "学校新增/修改自定义菜单权限")