Merge branch 'master' into developer

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

@@ -98,7 +98,7 @@ public class WxEnterpriseApiServiceImpl implements WxEnterpriseApiService {
             wxApplicationService.update(tab);
         }
         //企业代开发Secret = permanentCode
-        if (isCustomizedApp == 1) {
+        if (isCustomizedApp != null && isCustomizedApp == 1) {
             SecretSettingDTO secretSetting = secretSettingService.getSecretSetting(wxEnterpriseId, SecretTypeEnum.CUSTOMIZED_APP.getVal());
             if (secretSetting == null) {
                 secretSetting = new SecretSettingDTO();