|
@@ -83,14 +83,15 @@ public class MaterialDataController {
|
|
|
String roleCode = materialDataService.getRoleCodeByUserId(userId);
|
|
|
if ("designTeamLeader".equals(roleCode)) { // 设计组长查看自己和下级的数据
|
|
|
requestMap.put("leaderId", userId);
|
|
|
- } else if ("clip".equals(role)) {
|
|
|
- requestMap.put("clipId", userId);
|
|
|
- } else if ("plan".equals(role)) {
|
|
|
- requestMap.put("planId", userId);
|
|
|
- } else if ("shot".equals(role)) {
|
|
|
- requestMap.put("shotId", userId);
|
|
|
+ } else {
|
|
|
+ if ("clip".equals(role)) {
|
|
|
+ requestMap.put("clipId", userId);
|
|
|
+ } else if ("plan".equals(role)) {
|
|
|
+ requestMap.put("planId", userId);
|
|
|
+ } else if ("shot".equals(role)) {
|
|
|
+ requestMap.put("shotId", userId);
|
|
|
+ }
|
|
|
}
|
|
|
-
|
|
|
}
|
|
|
|
|
|
Long start = Long.valueOf(startDate.replace("-", ""));
|
|
@@ -167,12 +168,14 @@ public class MaterialDataController {
|
|
|
String roleCode = materialDataService.getRoleCodeByUserId(userId);
|
|
|
if ("designTeamLeader".equals(roleCode)) { // 设计组长查看自己和下级的数据
|
|
|
requestMap.put("leaderId", userId);
|
|
|
- } else if ("clip".equals(role)) {
|
|
|
- requestMap.put("clipId", userId);
|
|
|
- } else if ("plan".equals(role)) {
|
|
|
- requestMap.put("planId", userId);
|
|
|
- } else if ("shot".equals(role)) {
|
|
|
- requestMap.put("shotId", userId);
|
|
|
+ } else {
|
|
|
+ if ("clip".equals(role)) {
|
|
|
+ requestMap.put("clipId", userId);
|
|
|
+ } else if ("plan".equals(role)) {
|
|
|
+ requestMap.put("planId", userId);
|
|
|
+ } else if ("shot".equals(role)) {
|
|
|
+ requestMap.put("shotId", userId);
|
|
|
+ }
|
|
|
}
|
|
|
}
|
|
|
Long start = Long.valueOf(startDate.replace("-", ""));
|
|
@@ -214,12 +217,14 @@ public class MaterialDataController {
|
|
|
String roleCode = materialDataService.getRoleCodeByUserId(userId);
|
|
|
if ("designTeamLeader".equals(roleCode)) { // 设计组长查看自己和下级的数据
|
|
|
requestMap.put("leaderId", userId);
|
|
|
- } else if ("clip".equals(role)) {
|
|
|
- requestMap.put("clipId", userId);
|
|
|
- } else if ("plan".equals(role)) {
|
|
|
- requestMap.put("planId", userId);
|
|
|
- } else if ("shot".equals(role)) {
|
|
|
- requestMap.put("shotId", userId);
|
|
|
+ } else {
|
|
|
+ if ("clip".equals(role)) {
|
|
|
+ requestMap.put("clipId", userId);
|
|
|
+ } else if ("plan".equals(role)) {
|
|
|
+ requestMap.put("planId", userId);
|
|
|
+ } else if ("shot".equals(role)) {
|
|
|
+ requestMap.put("shotId", userId);
|
|
|
+ }
|
|
|
}
|
|
|
}
|
|
|
Long start = Long.valueOf(startDate.replace("-", ""));
|