Showing
1 changed file
with
7 additions
and
4 deletions
| @@ -50,14 +50,17 @@ public class ShipmentsPlanServiceImpl extends BaseMpServiceImpl<ShipmentsPlanMap | @@ -50,14 +50,17 @@ public class ShipmentsPlanServiceImpl extends BaseMpServiceImpl<ShipmentsPlanMap | ||
| 50 | List<SysRole> roleList = sysRoleService.getByUserId(currentUserId); | 50 | List<SysRole> roleList = sysRoleService.getByUserId(currentUserId); |
| 51 | for (SysRole role : roleList) { | 51 | for (SysRole role : roleList) { |
| 52 | String roleCode = role.getCode(); | 52 | String roleCode = role.getCode(); |
| 53 | + if (StringUtils.isBlank(roleCode)) { | ||
| 54 | + continue; | ||
| 55 | + } | ||
| 53 | String workshopCode = ""; | 56 | String workshopCode = ""; |
| 54 | - if ("yfcjybfhy".equals(roleCode) || "yfcjzcjjhy".equals(roleCode)) { | 57 | + if (roleCode.startsWith("yfc")) { |
| 55 | workshopCode = "yfc"; | 58 | workshopCode = "yfc"; |
| 56 | - } else if ("efcjybfhy".equals(roleCode) || "efcjzcjjhy".equals(roleCode)) { | 59 | + } else if (roleCode.startsWith("efc")) { |
| 57 | workshopCode = "efc"; | 60 | workshopCode = "efc"; |
| 58 | - } else if ("sfcjybfhy".equals(roleCode) || "sfcjzcjjhy".equals(roleCode)) { | 61 | + } else if (roleCode.startsWith("sfc")) { |
| 59 | workshopCode = "sfc"; | 62 | workshopCode = "sfc"; |
| 60 | - } else if ("ztfcjybfhy".equals(roleCode) || "ztfcjzcjjhy".equals(roleCode)) { | 63 | + } else if (roleCode.startsWith("ztfc") || roleCode.startsWith("ztc")) { |
| 61 | workshopCode = "ztfc"; | 64 | workshopCode = "ztfc"; |
| 62 | } | 65 | } |
| 63 | if (StringUtils.isNotBlank(workshopCode)) { | 66 | if (StringUtils.isNotBlank(workshopCode)) { |