Commit f666aded authored by fangxinjiang's avatar fangxinjiang

代码优化-fxj

parent 6ca89e82
...@@ -58,7 +58,9 @@ public class TEmployeeInsurancePreController { ...@@ -58,7 +58,9 @@ public class TEmployeeInsurancePreController {
menuUtil.setAuthSql(user, tEmployeeInsurancePre); menuUtil.setAuthSql(user, tEmployeeInsurancePre);
//无查询条件的时候直接 默认传非 已完成的数据 //无查询条件的时候直接 默认传非 已完成的数据
if (Common.isEmpty(tEmployeeInsurancePre.getProcessStatus())){ if (Common.isEmpty(tEmployeeInsurancePre.getProcessStatus())){
if (Common.isEmpty(tEmployeeInsurancePre.getStatusList())){
tEmployeeInsurancePre.setStatusList(CommonConstants.processListPreArchivesStatus); tEmployeeInsurancePre.setStatusList(CommonConstants.processListPreArchivesStatus);
}
}else { }else {
//有查询条件的时候 按查询条件查询 后面有判断statusList 为空默认的情况 //有查询条件的时候 按查询条件查询 后面有判断statusList 为空默认的情况
List<String> statusList = new ArrayList<>(); List<String> statusList = new ArrayList<>();
...@@ -154,7 +156,9 @@ public class TEmployeeInsurancePreController { ...@@ -154,7 +156,9 @@ public class TEmployeeInsurancePreController {
menuUtil.setAuthSql(user, searchVo); menuUtil.setAuthSql(user, searchVo);
//无查询条件的时候直接 默认传非 已完成的数据 //无查询条件的时候直接 默认传非 已完成的数据
if (Common.isEmpty(searchVo.getProcessStatus())){ if (Common.isEmpty(searchVo.getProcessStatus())){
if (Common.isEmpty(searchVo.getStatusList())){
searchVo.setStatusList(CommonConstants.processListPreArchivesStatus); searchVo.setStatusList(CommonConstants.processListPreArchivesStatus);
}
}else { }else {
//有查询条件的时候 按查询条件查询 后面有判断statusList 为空默认的情况 //有查询条件的时候 按查询条件查询 后面有判断statusList 为空默认的情况
List<String> statusList = new ArrayList<>(); List<String> statusList = new ArrayList<>();
......
...@@ -94,7 +94,7 @@ public class TDispatchInfoPreController { ...@@ -94,7 +94,7 @@ public class TDispatchInfoPreController {
if (Common.isEmpty(tDispatchInfoPre.getProcessStatus())) { if (Common.isEmpty(tDispatchInfoPre.getProcessStatus())) {
String typeSub = null==tDispatchInfoPre.getTypeSub()?CommonConstants.EMPTY_STRING:tDispatchInfoPre.getTypeSub(); String typeSub = null==tDispatchInfoPre.getTypeSub()?CommonConstants.EMPTY_STRING:tDispatchInfoPre.getTypeSub();
List<String> statusList = STATUS_MAP.get(typeSub); List<String> statusList = STATUS_MAP.get(typeSub);
if (statusList != null) { if (statusList != null && Common.isEmpty(tDispatchInfoPre.getStatusList())) {
tDispatchInfoPre.setStatusList(new ArrayList<>(statusList)); // 拷贝以防止外部修改 tDispatchInfoPre.setStatusList(new ArrayList<>(statusList)); // 拷贝以防止外部修改
} }
} }
...@@ -198,7 +198,7 @@ public class TDispatchInfoPreController { ...@@ -198,7 +198,7 @@ public class TDispatchInfoPreController {
if (Common.isEmpty(searchVo.getProcessStatus())) { if (Common.isEmpty(searchVo.getProcessStatus())) {
String typeSub = null==searchVo.getTypeSub()?CommonConstants.EMPTY_STRING:searchVo.getTypeSub(); String typeSub = null==searchVo.getTypeSub()?CommonConstants.EMPTY_STRING:searchVo.getTypeSub();
List<String> statusList = STATUS_MAP.get(typeSub); List<String> statusList = STATUS_MAP.get(typeSub);
if (statusList != null) { if (statusList != null && Common.isEmpty(searchVo.getStatusList())) {
searchVo.setStatusList(new ArrayList<>(statusList)); // 拷贝以防止外部修改 searchVo.setStatusList(new ArrayList<>(statusList)); // 拷贝以防止外部修改
} }
} }
...@@ -223,7 +223,7 @@ public class TDispatchInfoPreController { ...@@ -223,7 +223,7 @@ public class TDispatchInfoPreController {
if (Common.isEmpty(searchVo.getProcessStatus())) { if (Common.isEmpty(searchVo.getProcessStatus())) {
String typeSub = null==searchVo.getTypeSub()?CommonConstants.EMPTY_STRING:searchVo.getTypeSub(); String typeSub = null==searchVo.getTypeSub()?CommonConstants.EMPTY_STRING:searchVo.getTypeSub();
List<String> statusList = STATUS_MAP.get(typeSub); List<String> statusList = STATUS_MAP.get(typeSub);
if (statusList != null) { if (statusList != null && Common.isEmpty(searchVo.getStatusList())) {
searchVo.setStatusList(new ArrayList<>(statusList)); // 拷贝以防止外部修改 searchVo.setStatusList(new ArrayList<>(statusList)); // 拷贝以防止外部修改
} }
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment