Commit de1df0c3 authored by hongguangwu's avatar hongguangwu

区域

parent 64612b56
......@@ -813,6 +813,9 @@ public class TEmployeeInfoServiceImpl extends ServiceImpl<TEmployeeInfoMapper, T
} else {
dictDataMap = dictR.getData();
dictMap = dictDataMap.get("data");
if (dictMap == null) {
return R.failed("获取字典失败!!");
}
empMarriMap = dictMap.get("emp_married");
empNationalMap = dictMap.get("emp_national");
empPoliticalMap = dictMap.get("emp_political");
......@@ -826,11 +829,14 @@ public class TEmployeeInfoServiceImpl extends ServiceImpl<TEmployeeInfoMapper, T
, "/area/inner/getAreaToName", null, Map.class, SecurityConstants.FROM_IN);
Map<String, Map<String, String>> areaMapR;
Map<String, String> areaMap;
if (areaR == null) {
if (areaR == null || Common.isEmpty(areaR.getData())) {
return R.failed("获取区域失败!");
} else {
areaMapR = areaR.getData();
areaMap = areaMapR.get("data");
if (areaMap == null) {
return R.failed("获取区域失败!!");
}
}
TEmployeeInfo checkPhone;
......
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