员工非空判断添加，bug修改

src/main/java/cn/timer/api/controller/yggl/YgglController.java

@@ -51,8 +51,8 @@ import cn.hutool.core.date.DateUtil;
 import cn.hutool.core.lang.tree.Tree;
 import cn.hutool.core.lang.tree.Tree;
 import cn.hutool.core.lang.tree.TreeNodeConfig;
 import cn.hutool.core.lang.tree.TreeNodeConfig;
 import cn.hutool.core.lang.tree.TreeUtil;
 import cn.hutool.core.lang.tree.TreeUtil;
+import cn.hutool.core.util.ObjectUtil;
 import cn.hutool.core.util.StrUtil;
 import cn.hutool.core.util.StrUtil;
-import cn.hutool.json.JSONObject;
 import cn.hutool.json.JSONUtil;
 import cn.hutool.json.JSONUtil;
 import cn.timer.api.bean.clazz.CommonArea;
 import cn.timer.api.bean.clazz.CommonArea;
 import cn.timer.api.bean.clazz.SysRegion;
 import cn.timer.api.bean.clazz.SysRegion;
@@ -364,12 +364,17 @@ public class YgglController {
 		Integer zjType = addygdaDto.getZjType();
 		Integer zjType = addygdaDto.getZjType();
 		String zjNum = addygdaDto.getZjNum();
 		String zjNum = addygdaDto.getZjNum();
 		Integer jobType = addygdaDto.getJobType();
 		Integer jobType = addygdaDto.getJobType();
-		Date rzTime = new Date();
+		Date rzTime = addygdaDto.getRzTime();
 		Integer syq = addygdaDto.getSyq();
 		Integer syq = addygdaDto.getSyq();
 		Integer sex = addygdaDto.getSex();
 		Integer sex = addygdaDto.getSex();
+		Integer bmgwId = addygdaDto.getBmgwId();
 		if (StrUtil.hasBlank(phone) || StrUtil.hasBlank(name) || StrUtil.hasBlank(zjNum)) {
 		if (StrUtil.hasBlank(phone) || StrUtil.hasBlank(name) || StrUtil.hasBlank(zjNum)) {
 			return ResultUtil.error("请输入员工姓名,手机号和身份证号");
 			return ResultUtil.error("请输入员工姓名,手机号和身份证号");
 		}
 		}
+		if (!ObjectUtil.isAllNotEmpty(name,phone,zjType,zjNum,jobType,rzTime,syq,bmgwId,sex)) {
+			return ResultUtil.error("请完善员工信息！");
+		}
+		
 		QyzxEmpLogin login = new LambdaQueryChainWrapper<QyzxEmpLogin>(qyzxEmpLoginMapper)
 		QyzxEmpLogin login = new LambdaQueryChainWrapper<QyzxEmpLogin>(qyzxEmpLoginMapper)
 				.eq(!StrUtil.hasBlank(phone), QyzxEmpLogin::getPhone, phone).one();
 				.eq(!StrUtil.hasBlank(phone), QyzxEmpLogin::getPhone, phone).one();
 		if (login == null) {
 		if (login == null) {

src/main/java/cn/timer/api/dto/yggl/AddygdaDto.java

@@ -9,7 +9,6 @@ import java.io.Serializable;
 import java.util.Date;
 import java.util.Date;
 
 
 import javax.validation.constraints.NotBlank;
 import javax.validation.constraints.NotBlank;
-import javax.validation.constraints.NotEmpty;
 import javax.validation.constraints.NotNull;
 import javax.validation.constraints.NotNull;
 
 
 import cn.timer.api.config.exception.ValidationMsg;
 import cn.timer.api.config.exception.ValidationMsg;