Commit 51f2321731d35ac1c0cd9a4b9da63bbd1bf5cddc

Authored by 王通
1 parent fb2312f1

1.修复历史修正班次时不同角色的日期范围问题

src/main/java/com/bsth/common/Constants.java
@@ -67,7 +67,5 @@ public class Constants { @@ -67,7 +67,5 @@ public class Constants {
67 67
68 public static final String SSO_TOKEN = "ssoToken"; 68 public static final String SSO_TOKEN = "ssoToken";
69 69
70 - public static final String SPECIAL_ROLES = "special.roles";  
71 -  
72 public static final String RESOURCE_AUTHORITYS = "resourceAuthoritys"; 70 public static final String RESOURCE_AUTHORITYS = "resourceAuthoritys";
73 } 71 }
src/main/java/com/bsth/common/SystemParamKeys.java 0 → 100644
  1 +package com.bsth.common;
  2 +
  3 +/**
  4 + * @author Hill
  5 + */
  6 +public class SystemParamKeys {
  7 +
  8 + public static final String SPECIAL_ROLES = "special.roles";
  9 +}
src/main/java/com/bsth/util/PrivilegeUtils.java
1 package com.bsth.util; 1 package com.bsth.util;
2 2
3 import com.bsth.common.Constants; 3 import com.bsth.common.Constants;
  4 +import com.bsth.common.SystemParamKeys;
4 import com.bsth.data.BasicData; 5 import com.bsth.data.BasicData;
5 import com.bsth.entity.SystemParam; 6 import com.bsth.entity.SystemParam;
6 import com.bsth.entity.sys.Role; 7 import com.bsth.entity.sys.Role;
@@ -15,7 +16,7 @@ public class PrivilegeUtils { @@ -15,7 +16,7 @@ public class PrivilegeUtils {
15 16
16 public static int getHistoryEditDays() { 17 public static int getHistoryEditDays() {
17 Set<Role> roles = SecurityUtils.getCurrentUser().getRoles(); 18 Set<Role> roles = SecurityUtils.getCurrentUser().getRoles();
18 - SystemParam param = BasicData.getSystemParam().get(Constants.SPECIAL_ROLES); 19 + SystemParam param = BasicData.getSystemParam().get(SystemParamKeys.SPECIAL_ROLES);
19 int days = 4; 20 int days = 4;
20 if (param != null && param.getValue() != null) { 21 if (param != null && param.getValue() != null) {
21 for (Role role : roles) { 22 for (Role role : roles) {