Merge branch 'feature/xgh/2502朋友圈' into 'developer'

Feature/xgh/2502朋友圈

See merge request !2762

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

@@ -577,7 +577,7 @@ public class MessageApiServiceImpl implements MessageApiService {
             }
             byte[] data = ImageUtil.getImgbyte(headImgUrl);
             if(null == data) {
-                data = ImageUtil.getBytes(headImgUrl);
+                data = ImageUtil.getImgbyte(headImgUrl);
             }
             if (null == data) {
                 return headImgUrl;

haoban-manage3-wx/src/main/java/com/gic/haoban/manage/web/controller/WxEnterpriseInfoController.java

@@ -234,6 +234,9 @@ public class WxEnterpriseInfoController extends WebBaseController {
             if (null == loginUserDict) {
                 loginUserDict = managerDictService.getSMSDict("app_login_phone_num", loginStaff.getWxOpenUseId());
             }
+            if(null == loginUserDict) {
+                loginUserDict = managerDictService.getSMSDict("app_login_phone_num", loginStaff.getWxUserId());
+            }
             logger.info("伪登录：{}userId:{},loginUser={}", loginStaff.getPhoneNumber(), loginStaff.getWxOpenUseId(), JSONObject.toJSONString(loginUserDict));
             if (null != loginUserDict && StringUtils.isNotEmpty(loginUserDict.getDictName()) && loginUserDict.getDictName().split(":").length == 2) {
                 String dictValue = loginUserDict.getDictValue();