|
@@ -381,9 +381,12 @@ public class ArchivesAutoController extends BladeController {
|
|
//先验证当前项目是否在自动组卷中,组卷中直接返回
|
|
//先验证当前项目是否在自动组卷中,组卷中直接返回
|
|
//ProjectInfo projectInfo = projectClient.getById(String.valueOf(projectId));
|
|
//ProjectInfo projectInfo = projectClient.getById(String.valueOf(projectId));
|
|
ContractInfo contract = contractClient.getContractById(contractId);
|
|
ContractInfo contract = contractClient.getContractById(contractId);
|
|
- Integer isArchivesAuto = contract.getIsArchivesAuto();
|
|
|
|
- if(isArchivesAuto==-1 || isArchivesAuto==null || isArchivesAuto==0){
|
|
|
|
- isArchivesAuto=100;
|
|
|
|
|
|
+ Integer isArchivesAuto = 100;
|
|
|
|
+ if (contract != null) {
|
|
|
|
+ isArchivesAuto = contract.getIsArchivesAuto();
|
|
|
|
+ if(isArchivesAuto==-1 || isArchivesAuto==null || isArchivesAuto==0){
|
|
|
|
+ isArchivesAuto=100;
|
|
|
|
+ }
|
|
}
|
|
}
|
|
return R.data(isArchivesAuto);
|
|
return R.data(isArchivesAuto);
|
|
}catch (Exception e){
|
|
}catch (Exception e){
|