Merge remote-tracking branch 'origin/master'

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

@@ -192,10 +192,10 @@ public class WxEnterpriseServiceImpl implements WxEnterpriseService {
         if(mix3th && mixdk) {
             return 2 ;
         }
-        if(!mix3th && mixdk) {
+        if(mix3th && !mixdk) {
             return 3 ;
         }
-        if(mix3th && !mixdk) {
+        if(!mix3th && mixdk) {
             return 4 ;
         }
         return 0 ;
@@ -228,7 +228,7 @@ public class WxEnterpriseServiceImpl implements WxEnterpriseService {
             mixdk = true ;
         }
         int wxType = this.getType(mix3th, mixdk) ;
-        logger.info("更新企微加密类型,corpid3th={},corpidDk={},wxSecurityType={}",corpid3th,corpidDk,wxType);
+        logger.info("计算企微加密类型,corpid3th={},corpidDk={},wxSecurityType={}",corpid3th,corpidDk,wxType);
         return wxType ;
     }