点击刷新企业微信数据

haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/service/out/impl/StaffApiServiceImpl.java

@@ -320,33 +320,36 @@ public class StaffApiServiceImpl implements StaffApiService {
 			return res;
 		}
 		TabHaobanStaff staff = staffService.selectByUserIdAndEnterpriseId(userId,wxEnterpriseId);
+		staff = (staff==null?new TabHaobanStaff():staff);
+		staff.setWxUserId(userId);
+		staff.setUpdateTime(new Date());
+		staff.setStatusFlag(1);
+		staff.setWxEnterpriseId(wxEnterpriseId);
+		if(StringUtils.isNotBlank(user.getAvatar())){
+			staff.setHeadImg(changeHeaderImageUrl(user.getAvatar()));
+		}
+		staff.setPhoneNumber(user.getMobile());
+		if (StringUtils.isNotBlank(user.getName())) {
+			user.setName(EmojiParser.removeAllEmojis(user.getName()));
+			staff.setStaffName((user.getName()));
+		}
+		if (StringUtils.isNotBlank(user.getAlias())) {
+			user.setAlias(EmojiParser.removeAllEmojis(user.getAlias()));
+			staff.setNickName((user.getAlias()));
+		}
+		staff.setNationCode("86");
+		staff.setSex(user.getGender() == null ? 1:Integer.parseInt(user.getGender()));
+		staff.setActiveFlag(1);
+		staff.setPostion(user.getPosition());
+		staff.setExtendPostion(user.getExternal_position());
+		//成员更改或更新
 		if(staff == null) {
 			logger.info("新增成员");
-			staff = new TabHaobanStaff();
-			staff.setWxUserId(userId);
-			staff.setCreateTime(new Date());
-			staff.setUpdateTime(new Date());
-			staff.setStatusFlag(1);
-			staff.setWxEnterpriseId(wxEnterpriseId);
-			if(StringUtils.isNotBlank(user.getAvatar())){
-				staff.setHeadImg(changeHeaderImageUrl(user.getAvatar()));
-			}
-			staff.setPhoneNumber(user.getMobile());
-			if (StringUtils.isNotBlank(user.getName())) {
-				user.setName(EmojiParser.removeAllEmojis(user.getName()));
-				staff.setStaffName((user.getName()));
-			}
-			if (StringUtils.isNotBlank(user.getAlias())) {
-				user.setAlias(EmojiParser.removeAllEmojis(user.getAlias()));
-				staff.setNickName((user.getAlias()));
-			}
-			staff.setNationCode("86");
-			staff.setSex(user.getGender() == null ? 1:Integer.parseInt(user.getGender()));
-			staff.setActiveFlag(1);
-			staff.setPostion(user.getPosition());
-			staff.setExtendPostion(user.getExternal_position());
 			staff.setActiveFlag(0);
-			String staffId = staffService.add(staff);
+			staff.setCreateTime(new Date());
+			staffService.add(staff);
+		}else{
+			staffService.updateByPrimaryKey(staff);
 		}
 		logger.info("门店变更保存：{}",JSONObject.toJSONString(user));
 		staffDepartChange(staff,wxEnterpriseId,user);