fix：“优化公告区分申泽七云“

src/main/java/com/szwl/controller/TNoticeController.java

@@ -49,6 +49,7 @@ public class TNoticeController {
         tNotice.setTitle(notice.getTitle());
         tNotice.setNote(notice.getNote());
         tNotice.setStatus("0");
+        tNotice.setCompanyType(notice.getCompanyType());
         noticeService.save(tNotice);
         return R.ok(tNotice,"添加成功");
     }
@@ -60,8 +61,13 @@ public class TNoticeController {
             return R.fail(ResponseCodesEnum.A0001,"数据有空");
         }
         TAdmin admin = tAdminService.getById(adminId);
+        String companyType = admin.getCompanyType();
+        if(StringUtils.isEmpty(companyType)) {
+            companyType = "0";
+        }
         LambdaQueryWrapper<TNotice> query = Wrappers.lambdaQuery();
         query.eq(TNotice::getStatus,"0");
+        query.eq(TNotice::getCompanyType,companyType);
         query.orderByDesc(TNotice::getCreateDate);
         List<TNotice> notices = noticeService.list(query);
         if(notices.size() > 0){

src/main/java/com/szwl/mapper/xml/TNoticeMapper.xml

@@ -10,11 +10,12 @@
         <result column="title" property="title" />
         <result column="note" property="note" />
         <result column="status" property="status" />
+        <result column="company_type" property="companyType" />
     </resultMap>
 
     <!-- 通用查询结果列 -->
     <sql id="Base_Column_List">
-        id, create_date, modify_date, title, note, status
+        id, create_date, modify_date, title, note, status, company_type
     </sql>
 
 </mapper>

src/main/java/com/szwl/model/entity/TNotice.java

@@ -1,8 +1,11 @@
 package com.szwl.model.entity;
 
 import com.baomidou.mybatisplus.annotation.IdType;
+import java.util.Date;
 import com.baomidou.mybatisplus.annotation.TableId;
+import java.io.Serializable;
 import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 
@@ -15,7 +18,7 @@ import java.util.Date;
  * </p>
  *
  * @author wuhs
- * @since 2022-11-23
+ * @since 2024-04-16
  */
 @Data
 @EqualsAndHashCode(callSuper = false)
@@ -37,5 +40,8 @@ public class TNotice implements Serializable {
 
     private String status;
 
+    @ApiModelProperty(value = "公司平台，0或空为申泽，1为七云")
+    private String companyType;
+
 
 }