|
|
@@ -464,7 +464,7 @@ public class TakaiAiController extends BaseController {
|
|
|
List<TakaiApplicationResult> appList = takaiAisService.getApplicationList(vo);
|
|
|
return success(appList);
|
|
|
}else{
|
|
|
- TakaiApplication vo = setFlagParams(loginUser.getUserId(), null, null, 3);
|
|
|
+ TakaiApplication vo = setFlagParams(null, null, null, 3);
|
|
|
List<TakaiApplicationResult> appList = takaiAisService.getApplicationList(vo);
|
|
|
return success(appList);
|
|
|
}
|
|
|
@@ -773,7 +773,7 @@ public class TakaiAiController extends BaseController {
|
|
|
}
|
|
|
|
|
|
private TakaiApplication returnParams(String userId, String typeId, String projectId, String flag) {
|
|
|
- return TakaiApplication.builder().approver(userId)
|
|
|
+ return TakaiApplication.builder().approver(userId == null ? null : userId)
|
|
|
.typeId(typeId == null ? null : Long.valueOf(typeId))
|
|
|
.projectId(projectId == null ? null : projectId)
|
|
|
.flag(flag).build();
|