Merge branch 'feature/五月二期' into 'master'

空指针异常处理

See merge request !1299

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

@@ -569,7 +569,7 @@ public class WxEnterpriseApiServiceImpl implements WxEnterpriseApiService {
             SecretSettingDTO secretSetting = secretSettingService.getSecretSetting(wxEnterpriseId, SecretTypeEnum.SELF_APP.getVal());
             if (null != secretSetting){
                 //更新secret表
-                if (!secretSetting.getAgentName().equals(enterpriseDTO.getAgentName())){
+                if (null != enterpriseDTO.getAgentName() && (!enterpriseDTO.getAgentName().equals(secretSetting.getAgentName()))){
                     SecretSettingDTO dto = new SecretSettingDTO();
                     dto.setSecretId(secretSetting.getSecretId());
                     dto.setAgentName(enterpriseDTO.getAgentName());