Merge remote-tracking branch 'origin/master'

mec-biz/src/main/java/com/ym/mec/biz/service/impl/EmployeeServiceImpl.java

@@ -122,6 +122,9 @@ public class EmployeeServiceImpl extends BaseServiceImpl<Integer, Employee>  imp
 			if(sysUser != null && !sysUser.getId().equals(employee.getUserId())){
 				throw new BizException("手机号已存在");
 			}
+			if(sysUser == null){
+				sysUser = sysUserFeignService.queryUserInfo();
+			}
 		}
 		employeeDao.update(employee);
 		//删除当前用户角色

mec-web/src/main/java/com/ym/mec/web/controller/ExportController.java

@@ -14,7 +14,6 @@ import io.swagger.annotations.ApiOperation;
 import java.io.IOException;
 import java.io.OutputStream;
 import java.math.BigDecimal;
-import java.text.NumberFormat;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Date;