Merge remote-tracking branch 'origin/master'

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

@@ -217,12 +217,12 @@ public class ClerkController extends WebBaseController {
         }
         Integer agreeExternalUseridFlag = wxEnterpriseDTO.getAgreeExternalUseridFlag();
         int memberOpenCardFlag = enterpriseBindInfo.getMemberOpenCardFlag();
-        if (memberOpenCardFlag == 1 && agreeExternalUseridFlag != null && agreeExternalUseridFlag == 1) {
-            auditSettingVO.setMemberOpenCardFlag(1);
-        } else if (memberOpenCardFlag == 0) {
-            auditSettingVO.setMemberOpenCardFlag(1);
-        } else {
+        boolean agreeExternalUserid = agreeExternalUseridFlag == null || agreeExternalUseridFlag != 1;
+        //同一开平并且未同意转换
+        if (memberOpenCardFlag == 0 && agreeExternalUserid) {
             auditSettingVO.setMemberOpenCardFlag(0);
+        } else {
+            auditSettingVO.setMemberOpenCardFlag(1);
         }
         auditSettingVO.setWxEnterpriseType(enterpriseBindInfo.getWxEnterpriseType());
         auditSettingVO.setFreshFriendFlag(mainStore.getFreshFriendFlag());