浏览代码

同步的提交

dongxin 11 月之前
父节点
当前提交
38bf87edc2

+ 7 - 2
linkwe-chinacoal/src/main/java/com/linkwechat/coal/modules/bdshdb/customer/scheduled/SyncUserDataScheduledService.java

@@ -9,6 +9,7 @@ import com.linkwechat.coal.modules.bdshdb.customer.service.ILocalAppUserService;
 import com.linkwechat.coal.modules.jzgdb.customer.domain.dto.SysUserJzgDto;
 import com.linkwechat.coal.modules.jzgdb.customer.domain.vo.SysUserJzgVo;
 import com.linkwechat.coal.modules.jzgdb.customer.service.ISysUserJzgService;
+import com.linkwechat.common.utils.StringUtils;
 import com.linkwechat.domain.WeCustomerUser;
 import com.linkwechat.domain.WeUser;
 import com.linkwechat.service.IWeCustomerUserService;
@@ -145,8 +146,12 @@ public class SyncUserDataScheduledService {
                 weUser.setUserCode(sysUserJzgVo.getId().toString());
                 weUser.setName(sysUserJzgVo.getName());
                 weUser.setPhone(sysUserJzgVo.getMobile());
-                weUser.setSex(sysUserJzgVo.getSex().equals("M") ? 1 : 0);
-                weUser.setBirthday(sysUserJzgVo.getBirthday());
+                if (StringUtils.isNotEmpty(sysUserJzgVo.getSex())){
+                    weUser.setSex(sysUserJzgVo.getSex().equals("M") ? 1 : 0);
+                }
+                if (Objects.nonNull(sysUserJzgVo.getBirthday())){
+                    weUser.setBirthday(sysUserJzgVo.getBirthday());
+                }
                 weUser.setSource(0); // 晋掌柜
                 weUser.setType(0);
                 weUser.setRegisterTime(sysUserJzgVo.getCreateTime());

+ 6 - 2
linkwe-chinacoal/src/main/java/com/linkwechat/coal/modules/jzgdb/customer/controller/SysUserJzgController.java

@@ -72,8 +72,12 @@ public class SysUserJzgController {
                 weUser.setUserCode(sysUserJzgVo.getId().toString());
                 weUser.setName(sysUserJzgVo.getName());
                 weUser.setPhone(sysUserJzgVo.getMobile());
-                weUser.setSex(sysUserJzgVo.getSex().equals("M") ? 1 : 0);
-                weUser.setBirthday(sysUserJzgVo.getBirthday());
+                if (StringUtils.isNotEmpty(sysUserJzgVo.getSex())){
+                    weUser.setSex(sysUserJzgVo.getSex().equals("M") ? 1 : 0);
+                }
+                if (Objects.nonNull(sysUserJzgVo.getBirthday())){
+                    weUser.setBirthday(sysUserJzgVo.getBirthday());
+                }
                 weUser.setSource(0); // 晋掌柜
                 weUser.setType(0);
                 weUser.setRegisterTime(sysUserJzgVo.getCreateTime());