Merge branch 'feature/xgh/20241月迭代' into 'master'

非空判断

See merge request !1630

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

@@ -532,7 +532,7 @@ public class DealSyncOperationApiServiceImpl implements DealSyncOperationApiServ
         logger.info("同步通讯录开始={},taskId={}",wxEnterpriseId,taskId);
         WxEnterpriseQwDTO qwDTO = this.wxEnterpriseService.getQwInfo(wxEnterpriseId) ;
         SecretSettingDTO secretSetting = secretSettingService.getSecretSetting(qwDTO.getWxEnterpriseId(), SecretTypeEnum.CUSTOMIZED_APP.getVal());
-        if (null == secretSetting || secretSetting.getCheckFlag() == 0) {
+        if (null == secretSetting || null == secretSetting.getCheckFlag() || secretSetting.getCheckFlag() == 0) {
             logger.info("没有配置secret");
             syncTaskService.updateTaskStatus(taskId, SyncTaskStatusEnum.exception_close.getVal());
             unlockTask(wxEnterpriseId);