Merge branch 'fixbug_0308' into developer

# Conflicts:
#	haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/service/out/impl/MessageApiServiceImpl.java

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

@@ -301,12 +301,16 @@ public class MessageApiServiceImpl implements MessageApiService {
 
     private String changeHeaderImageUrl(String headImgUrl) {
         try {
+            log.info("图片headImgUrl:{}",headImgUrl);
+            if (StringUtils.isBlank(headImgUrl)) {
+                return headImgUrl;
+            }
             byte[] data = ImageUtil.getImgbyte(headImgUrl);
             PicUploadResDTO uploadPic = qqCloudPicService.uploadPic(GlobalVar.ctxPropertiesMap.get(GlobalInfo.QQPIC_KEY_ENTERPRISE), data);
             log.info("腾讯云万象优图返回" + JSON.toJSONString(uploadPic));
             return uploadPic.downloadUrl;
         } catch (Exception e) {
-            log.info("上传腾讯云万象优图返回失败了：", e);
+            log.info("上传腾讯云万象优图返回失败了：{}", e.getMessage());
             return headImgUrl;
         }
     }

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

@@ -24,7 +24,6 @@ import com.gic.haoban.manage.api.dto.*;
 import com.gic.haoban.manage.api.enums.SecretTypeEnum;
 import com.gic.haoban.manage.api.service.DepartmentApiService;
 import com.gic.haoban.manage.api.service.StaffApiService;
-import com.gic.haoban.manage.service.config.Config;
 import com.gic.haoban.manage.service.dao.mapper.StaffDepartmentRelatedMapper;
 import com.gic.haoban.manage.service.dao.mapper.StaffMapper;
 import com.gic.haoban.manage.service.entity.TabHaobanDepartment;
@@ -100,8 +99,6 @@ public class StaffApiServiceImpl implements StaffApiService {
     private SecretSettingService secretSettingService;
     @Autowired
     private StaffPrivacyUseLogService staffPrivacyUseLogService;
-    @Autowired
-    private Config config;
 
     @Override
     public StaffDTO selectById(String staffId) {
@@ -1226,12 +1223,16 @@ public class StaffApiServiceImpl implements StaffApiService {
 
     private String changeHeaderImageUrl(String headImgUrl) {
         try {
+            logger.info("图片headImgUrl：{}", headImgUrl);
+            if (StringUtils.isBlank(headImgUrl)) {
+                return headImgUrl;
+            }
             byte[] data = ImageUtil.getImgbyte(headImgUrl);
             PicUploadResDTO uploadPic = qqCloudPicService.uploadPic(GlobalVar.ctxPropertiesMap.get(GlobalInfo.QQPIC_KEY_ENTERPRISE), data);
             logger.info("腾讯云万象优图返回" + JSON.toJSONString(uploadPic));
             return uploadPic.downloadUrl;
         } catch (Exception e) {
-            logger.info("上传腾讯云万象优图返回失败了：", e);
+            logger.info("上传腾讯云万象优图返回失败了:{}", e.getMessage());
             return headImgUrl;
         }
     }