|
|
@ -179,7 +179,7 @@ public class SignInAccountServiceImpl implements SignInAccountService, Applicati
|
|
|
|
client.putAll(clientConfigService.find(client_id));
|
|
|
|
client.putAll(clientConfigService.find(client_id));
|
|
|
|
client = clientInfoWithNoSecretInfo(client);
|
|
|
|
client = clientInfoWithNoSecretInfo(client);
|
|
|
|
client.put("client_less_file", false);
|
|
|
|
client.put("client_less_file", false);
|
|
|
|
if ((client.getIntValue("approve_result") == 2 || client.getIntValue("open_status") == 10 || client.getIntValue("approve_result") ==1 || client.getIntValue("open_status") == 5) && client.getIntValue("source")!=4) {
|
|
|
|
if ((client.getIntValue("approve_result") == 2 || client.getIntValue("open_status") == 10 || client.getIntValue("approve_result") ==1 || client.getIntValue("open_status") == 5)) {
|
|
|
|
List<JSONObject> clientFiles = clientFilesMapper.findAllClientFile(client.getIntValue("client_id"));
|
|
|
|
List<JSONObject> clientFiles = clientFilesMapper.findAllClientFile(client.getIntValue("client_id"));
|
|
|
|
if (clientFiles != null && clientFiles.size() > 0) {
|
|
|
|
if (clientFiles != null && clientFiles.size() > 0) {
|
|
|
|
clientFiles = clientFiles.stream().filter(fileJson -> ((fileJson.getIntValue("status") == 1 || fileJson.getIntValue("status") == 2))).collect(Collectors.toList());
|
|
|
|
clientFiles = clientFiles.stream().filter(fileJson -> ((fileJson.getIntValue("status") == 1 || fileJson.getIntValue("status") == 2))).collect(Collectors.toList());
|
|
|
@ -737,7 +737,7 @@ public class SignInAccountServiceImpl implements SignInAccountService, Applicati
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
if ((client.getIntValue("approve_result") == 2 || client.getIntValue("open_status") == 10 || client.getIntValue("approve_result") == 1 || client.getIntValue("open_status") == 5) && client.getIntValue("source")!=4 ) {
|
|
|
|
if ((client.getIntValue("approve_result") == 2 || client.getIntValue("open_status") == 10 || client.getIntValue("approve_result") == 1 || client.getIntValue("open_status") == 5)) {
|
|
|
|
if (clientFilesIsLess) {
|
|
|
|
if (clientFilesIsLess) {
|
|
|
|
result.put("client_less_file", clientFilesIsLess);
|
|
|
|
result.put("client_less_file", clientFilesIsLess);
|
|
|
|
whenClientLessFile(client, result);
|
|
|
|
whenClientLessFile(client, result);
|
|
|
|