Merge branch 'hurx'

ruoyi-modules/ruoyi-customer/src/main/java/org/dromara/customer/controller/pc/PcCustomerMessageController.java

@@ -40,6 +40,18 @@ public class PcCustomerMessageController extends BaseController {
         return customerMessageService.queryPageList(bo, pageQuery);
     }
 
+    /**
+     * 查询客户最新公告
+     */
+    @GetMapping("/getNewNotice")
+    public R<CustomerMessageVo> getNewNotice() {
+        // 获取当前登录用户的企业ID
+        Long customerId = LoginHelper.getLoginUser().getCustomerId();
+        CustomerMessageBo bo = new CustomerMessageBo();
+        bo.setCustomerId(customerId);
+        return R.ok(customerMessageService.getNewNotice(bo));
+    }
+
     /**
      * 获取客户消息详细信息
      *

ruoyi-modules/ruoyi-customer/src/main/java/org/dromara/customer/mapper/CustomerInfoMapper.java

@@ -19,12 +19,12 @@ import org.dromara.customer.domain.vo.MessagePublishCustomerVo;
  * @author LionLi
  * @date 2025-12-11
  */
-@DataPermission({
-    @DataColumn(key = "deptName", value = "belonging_department_id"),
-    @DataColumn(key = "userName", value = "create_by"),
-    @DataColumn(key = "salesPersonName", value = "sales_person_id"),
-    @DataColumn(key = "serviceStaffName", value = "service_staff_id")
-})
+//@DataPermission({
+//    @DataColumn(key = "deptName", value = "belonging_department_id"),
+//    @DataColumn(key = "userName", value = "create_by"),
+//    @DataColumn(key = "salesPersonName", value = "sales_person_id"),
+//    @DataColumn(key = "serviceStaffName", value = "service_staff_id")
+//})
 public interface CustomerInfoMapper extends BaseMapperPlus<CustomerInfo, CustomerInfoVo> {
 
     /**

ruoyi-modules/ruoyi-customer/src/main/java/org/dromara/customer/service/ICustomerMessageService.java

@@ -59,6 +59,14 @@ public interface ICustomerMessageService extends IService<CustomerMessage> {
      */
     Boolean updateByBo(CustomerMessageBo bo);
 
+    /**
+     * 查询客户最新公告
+     *
+     * @param bo 查询条件（包含customerId）
+     * @return 最新一条客户消息
+     */
+    CustomerMessageVo getNewNotice(CustomerMessageBo bo);
+
     /**
      * 校验并批量删除客户消息信息
      *

ruoyi-modules/ruoyi-customer/src/main/java/org/dromara/customer/service/impl/CustomerMessageServiceImpl.java

@@ -86,6 +86,22 @@ public class CustomerMessageServiceImpl extends ServiceImpl<CustomerMessageMappe
         return lqw;
     }
 
+    /**
+     * 查询客户最新公告
+     *
+     * @param bo 查询条件（包含customerId）
+     * @return 最新一条客户消息
+     */
+    @Override
+    public CustomerMessageVo getNewNotice(CustomerMessageBo bo) {
+        LambdaQueryWrapper<CustomerMessage> lqw = Wrappers.lambdaQuery();
+        lqw.eq(bo.getCustomerId() != null, CustomerMessage::getCustomerId, bo.getCustomerId());
+        lqw.eq(CustomerMessage::getStatus, "0");
+        lqw.orderByDesc(CustomerMessage::getCreateTime);
+        lqw.last("limit 1");
+        return baseMapper.selectVoOne(lqw);
+    }
+
     /**
      * 新增客户消息
      *