fix：登录bug修改

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

@@ -356,14 +356,14 @@ public class WxEnterpriseApiServiceImpl implements WxEnterpriseApiService {
         StaffPrivacyUseLogBO staffPrivacyUseLogBO = new StaffPrivacyUseLogBO();
         BeanUtils.copyProperties(staffPrivacyUseLogDTO, staffPrivacyUseLogBO);
         String staffId = staffPrivacyUseLogDTO.getStaffId();
-        if (!"-1".equals(staffId) || StringUtils.isNotBlank(staffId)) {
-            StaffPrivacyUseLogBO privacyUseLog = staffPrivacyUseLogService.getByStaffId(staffId);
-            if (privacyUseLog == null) {
+        if (StringUtils.isBlank(staffId) || "-1".equals(staffId)) {
+            StaffPrivacyUseLogBO privacyUseLogBO = staffPrivacyUseLogService.getByUserId(staffPrivacyUseLogDTO.getWxOpenUseId());
+            if (privacyUseLogBO == null) {
                 staffPrivacyUseLogService.insert(staffPrivacyUseLogBO);
             }
         } else {
-            StaffPrivacyUseLogBO privacyUseLogBO = staffPrivacyUseLogService.getByUserId(staffPrivacyUseLogDTO.getWxOpenUseId());
-            if (privacyUseLogBO == null) {
+            StaffPrivacyUseLogBO privacyUseLog = staffPrivacyUseLogService.getByStaffId(staffId);
+            if (privacyUseLog == null) {
                 staffPrivacyUseLogService.insert(staffPrivacyUseLogBO);
             }
         }

haoban-manage3-wx/src/main/java/com/gic/haoban/manage/web/controller/WxEnterpriseInfoController.java

@@ -133,7 +133,7 @@ public class WxEnterpriseInfoController extends WebBaseController {
             StaffPrivacyUseLogDTO staffPrivacyUseLogDTO = staffApiService.getStaffPrivacyByUserId(userId);
             wellDoneLoginInfoVo.setPrivacyUseFlag(staffPrivacyUseLogDTO == null ? 0 : 1);
             wellDoneLoginInfoVo.setStaffId("-1");
-            return resultResponse(HaoBanErrCode.ERR_1,wellDoneLoginInfoVo);
+            return resultResponse(HaoBanErrCode.ERR_1, wellDoneLoginInfoVo);
         }
 
         if (StringUtils.isNotBlank(loginStaff.getPhoneNumber())) {
@@ -197,7 +197,7 @@ public class WxEnterpriseInfoController extends WebBaseController {
         String staffId = staffLoginQO.getStaffId();
         String wxOpenUseId = staffLoginQO.getWxOpenUseId();
         //-1 代表游客登录
-        if ("-1".equals(staffId) || StringUtils.isBlank(staffId)) {
+        if (StringUtils.isBlank(staffId) || "-1".equals(staffId)) {
             return wellDoneLoginPrivacy(staffLoginQO, request, staffId, wxOpenUseId);
         }
         //用户登录
@@ -206,6 +206,7 @@ public class WxEnterpriseInfoController extends WebBaseController {
 
     /**
      * 游客登录
+     *
      * @param staffLoginQO
      * @param request
      * @param staffId
@@ -233,6 +234,7 @@ public class WxEnterpriseInfoController extends WebBaseController {
 
     /**
      * 刷新token
+     *
      * @return
      */
     private RestResponse<String> getRefreshToken() {
@@ -245,6 +247,7 @@ public class WxEnterpriseInfoController extends WebBaseController {
 
     /**
      * 用户登录
+     *
      * @param staffLoginQO
      * @param request
      * @param staffId