2 Commit-ok c6a9f0eb6b ... 0039d24dfa

Szerző SHA1 Üzenet Dátum
  ‘linchangsheng’ 0039d24dfa Merge remote-tracking branch 'origin/master' 1 hete
  ‘linchangsheng’ bc0032427c 需求 1 hete

+ 4 - 2
mall-miniapp-service/src/main/java/com/gree/mall/miniapp/logic/user/UserLogic.java

@@ -1363,11 +1363,13 @@ public class UserLogic {
                 throw new RemoteServiceException("您已入驻当前网点");
             }
 
-            websitUserService.lambdaUpdate().eq(WebsitUser::getUserId, user.getUserId()).eq(WebsitUser::getWebsitId, websitId).remove();
+            WebsitUser websitUser1 = websitUserService.lambdaQuery().eq(WebsitUser::getUserId, user.getUserId()).eq(WebsitUser::getWebsitId, websitId).one();
 
             AdminWebsit adminWebsit = adminWebsitService.getById(websitId);
 
             WebsitUser websitUser = new WebsitUser();
+            if (websitUser1 != null)
+                websitUser.setId(websitUser1.getId());
             websitUser.setWebsitId(websitId);
             websitUser.setWebsitName(adminWebsit.getName());
             if (!StringUtil.isEmpty(currentCompanyWechat.getUser().getWorkerNumber()) &&
@@ -1391,7 +1393,7 @@ public class UserLogic {
             websitUser.setCreateTime(new Date());
             websitUser.setExamineStatus(OrderExamineEnum.WAIT.toString());
             websitUser.setBankAccount(bankAccount);
-            websitUser.insert();
+            websitUser.insertOrUpdate();
 
             if (userApplyBean.getWorkerPolicy()!= null) {