gfwleak/k18-ntcs-web-argus-service
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'develop' of http://10.0.6.99/common/maat_service.git into develop

Browse Source
This commit is contained in:
RenKaiGe-Office
2018-08-27 19:13:19 +08:00
parent 242f59c530 b6013186d3
commit b4a844b33c
3 changed files with 12 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/main/java/com/nis/restful/RestBusinessCode.java
View File

@@ -107,7 +107,10 @@ public enum RestBusinessCode {
* 编译配置的的endTime不能为空
*/
EndTimeIsNull(4001011, "Maat配置的endTime不能为空"),
/**
* 配置的userRegion不能为空
*/
UserRegionIsNull(4001012, "配置userRegion属性不能为空"),
/**
* 配置的userRegion不能为空
*/

9
src/main/java/com/nis/util/CompileVal.java
View File

@@ -489,10 +489,11 @@ public class CompileVal {
throw new RestServiceException("编译配置id为" + compileId + "的编译配置中endTime不能为空",
RestBusinessCode.EndTimeIsNull.getValue());
}
// if (null == configCompile.getUserRegion() ||
// configCompile.getUserRegion().equals("")) {
// return "编译配置id为" + compileId + "的编译配置中userRegion不能为空";
// }
if (null == configCompile.getUserRegion() ||
configCompile.getUserRegion().equals("")) {
throw new RestServiceException("编译配置id为" + compileId + "的编译配置中userRegion不能为空",
RestBusinessCode.UserRegionIsNull.getValue());
}
if (null == configCompile.getIsValid()) {
throw new RestServiceException("编译配置id为" + compileId + "的编译配置中isValid不能为空",
RestBusinessCode.IsValidIsNull.getValue());