Merge remote-tracking branch 'origin/eitc-erm' into eitc-erm

eitc-common/src/main/java/com/eitc/common/handler/MyMetaObjectHandler.java

@@ -81,9 +81,9 @@ public class MyMetaObjectHandler implements MetaObjectHandler {
         String username = "";
         try {
             try {
-                username = SecurityUtils.getUsername();
+                username = SecurityUtils.getLoginUser().getUser().getNickName();
             } catch (ServiceException e) {
-                log.error("获取用户失败{}", e.getMessage());
+                log.error("获取PC用户失败{}", e.getMessage());
                 username = JWTUtil.getAppPhoneNumber();
             }
         } catch (Exception e) {

eitc-patient-pc/src/main/java/com/eitc/patient/controller/NoticeManageController.java

@@ -89,7 +89,7 @@ public class NoticeManageController extends BaseController {
         if (Objects.equals(noticeManage.getPublishStatus(), NoticeManagePublishStatusEnum.PUBLISH.getCode())) {
             return AjaxResult.error("请先撤回");
         }
-        noticeManage.setDisplayStatus(noticeManageService.checkDisplayStatus(noticeManage));
+        entry.setDisplayStatus(noticeManageService.checkDisplayStatus(entry));
         return toAjax(noticeManageService.updateById(entry));
     }