Merge branch 'fixbug_0429' into developer

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

@@ -131,8 +131,8 @@ public class WxEnterpriseInfoController extends WebBaseController {
             WellDoneLoginInfoVO wellDoneLoginInfoVo = new WellDoneLoginInfoVO();
             wellDoneLoginInfoVo.setWxOpenUseId(userId);
             StaffPrivacyUseLogDTO staffPrivacyUseLogDTO = staffApiService.getStaffPrivacyByUserId(userId);
-            //wellDoneLoginInfoVo.setPrivacyUseFlag(staffPrivacyUseLogDTO == null ? 0 : 1);
-            wellDoneLoginInfoVo.setPrivacyUseFlag(1);
+            wellDoneLoginInfoVo.setPrivacyUseFlag(staffPrivacyUseLogDTO == null ? 0 : 1);
+            //wellDoneLoginInfoVo.setPrivacyUseFlag(1);
             wellDoneLoginInfoVo.setStaffId("-1");
             return resultResponse(HaoBanErrCode.ERR_1, wellDoneLoginInfoVo);
         }
@@ -179,8 +179,8 @@ public class WxEnterpriseInfoController extends WebBaseController {
         wellDoneLoginInfoVo.setNationcode(loginStaff.getNationCode());
         wellDoneLoginInfoVo.setWxUserId(loginStaff.getWxUserId());
         StaffPrivacyUseLogDTO staffPrivacyUseLogDTO = staffApiService.getStaffPrivacyByStaffId(staffId);
-        //wellDoneLoginInfoVo.setPrivacyUseFlag(staffPrivacyUseLogDTO == null ? 0 : 1);
-        wellDoneLoginInfoVo.setPrivacyUseFlag(1);
+        wellDoneLoginInfoVo.setPrivacyUseFlag(staffPrivacyUseLogDTO == null ? 0 : 1);
+        //wellDoneLoginInfoVo.setPrivacyUseFlag(1);
         return resultResponse(HaoBanErrCode.ERR_1, wellDoneLoginInfoVo);
     }