Merge branch 'develop' of http://develop-gitlab.youlingrc.com/8timerv2/8timerapiv200.git into tzq

src/main/java/cn/timer/api/controller/dzht/DzhtController.java

@@ -355,6 +355,8 @@ public class DzhtController {
 		} else {
 			DzhtController2 d = new DzhtController2();
 			accountId = d.grzc(userBean, empNum);
+			if (accountId.equals("IDCARD-ERROR"))
+				return ResultUtil.error("请先完善身份证信息！");
 		}
 		grrz.setAccountId(accountId);
 
@@ -623,7 +625,7 @@ public class DzhtController {
 			code = a.getBody().get("code").toString();
 			returnList.add(a.getBody());
 		}
-		if (code.equals("0")) {
+		if (code != null && code.equals("0")) {
 			return ResultUtil.data(returnList);
 		} else {
 			return ResultUtil.data(returnList, "查询失败");

src/main/java/cn/timer/api/controller/dzht/DzhtController2.java

@@ -112,6 +112,8 @@ public class DzhtController2 {
 			String name = yg.getName();
 			Integer type = yg.getZjType();
 			String idType = null;
+			if (type == null) 
+				return "IDCARD-ERROR";
 			if (type == 0) {
 				idType = "CRED_PSN_CH_IDCARD";// 大陆身份证
 			} else if (type == 1) {