|
@@ -49,10 +49,7 @@ import javax.annotation.Resource;
|
|
|
import java.math.BigDecimal;
|
|
|
import java.time.LocalDate;
|
|
|
import java.time.LocalDateTime;
|
|
|
-import java.util.ArrayList;
|
|
|
-import java.util.HashMap;
|
|
|
-import java.util.List;
|
|
|
-import java.util.Map;
|
|
|
+import java.util.*;
|
|
|
import java.util.stream.Collectors;
|
|
|
|
|
|
/**
|
|
@@ -252,6 +249,7 @@ public class PreparationServiceImpl extends BaseServiceImpl<PreparationMapper, P
|
|
|
// 申请人
|
|
|
record.setUserId(userInfo.getUserId());
|
|
|
}
|
|
|
+
|
|
|
//}
|
|
|
if (record.getSearchType() != null && record.getStatus() == null) {
|
|
|
List<Integer> statusList = new ArrayList<>();
|
|
@@ -281,6 +279,16 @@ public class PreparationServiceImpl extends BaseServiceImpl<PreparationMapper, P
|
|
|
}
|
|
|
record.setStatusList(statusList);
|
|
|
} else if (record.getSearchType() == 3) { // 我的工单
|
|
|
+ }else if (record.getSearchType() ==-1){
|
|
|
+ String userStr = ConfigCache.getLabelByValue("PREPARATION_QUERY_ALL_INFO_USERS");
|
|
|
+ if (!StringUtils.isEmpty(userStr)){
|
|
|
+ List<String> users = Arrays.asList(userStr.split(","));
|
|
|
+ users.forEach(item->{
|
|
|
+ if (userInfo.getUsername().equals(item)){
|
|
|
+ record.setUserId(null);
|
|
|
+ }
|
|
|
+ });
|
|
|
+ }
|
|
|
}
|
|
|
// 超级管理员可以看到各个状态下的所有数据 相关领导,可以在这里进行设置
|
|
|
/*if (userInfo.getSuperAdmin() == 1) {
|