From dc665a3e87d21d8d4b6f91cac24043e1b1e35449 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9B=B2=E6=A0=91=E9=80=9A?= <1976590620@qq.com>
Date: Mon, 17 Feb 2020 13:18:56 +0800
Subject: [PATCH] =?UTF-8?q?=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/elink/esua/epdc/service/impl/UserServiceImpl.java | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/service/impl/UserServiceImpl.java b/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/service/impl/UserServiceImpl.java
index f1905abea..87a81bec1 100644
--- a/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/service/impl/UserServiceImpl.java
+++ b/esua-epdc/epdc-module/epdc-user/epdc-user-server/src/main/java/com/elink/esua/epdc/service/impl/UserServiceImpl.java
@@ -34,9 +34,7 @@ import com.elink.esua.epdc.commons.tools.page.PageData;
 import com.elink.esua.epdc.commons.tools.redis.UserDetailRedis;
 import com.elink.esua.epdc.commons.tools.security.user.SecurityUser;
 import com.elink.esua.epdc.commons.tools.security.user.UserDetail;
-import com.elink.esua.epdc.commons.tools.utils.ConvertUtils;
-import com.elink.esua.epdc.commons.tools.utils.MessageUtils;
-import com.elink.esua.epdc.commons.tools.utils.Result;
+import com.elink.esua.epdc.commons.tools.utils.*;
 import com.elink.esua.epdc.config.StreamUtils;
 import com.elink.esua.epdc.constant.AuthenticatedConsant;
 import com.elink.esua.epdc.constant.UserFieldConsant;
@@ -999,7 +997,7 @@ public class UserServiceImpl extends BaseServiceImpl<UserDao, UserEntity> implem
             userItem.setIdentityNo(userItem.getIdentityNo().trim());
             userItem.setRealName(userItem.getRealName().trim());
             userItem.setMobile(userItem.getMobile().trim());
-            userItem.setWxOpenId("taidong_"+time+""+(i++));
+            userItem.setWxOpenId("taidong_"+time+"_"+(i++));
             userItem.setDeptId(gridId);
             userItem.setPartyFlag("1");
             userItem.setState("3");
@@ -1007,6 +1005,8 @@ public class UserServiceImpl extends BaseServiceImpl<UserDao, UserEntity> implem
             userItem.setAllDeptNames(parentAndAllDeptDTOResult.getData().getAllDeptNames());
             userItem.setParentDeptIds(parentAndAllDeptDTOResult.getData().getParentDeptIds());
             userItem.setParentDeptNames(parentAndAllDeptDTOResult.getData().getParentDeptNames());
+            userItem.setSex(IdentityNoUtils.getSex(userItem.getIdentityNo()));
+            userItem.setBirthday(DateUtils.parse(IdentityNoUtils.getBirthday(userItem.getIdentityNo()), DateUtils.DATE_PATTERN));
         }
         // 插入用户表
         insertBatch(userEntities);