公司信息管理

website-module-system/website-module-system-biz/src/main/java/com/cjy/website/module/system/controller/admin/columninfo/ColumnInfoController.java

@@ -70,9 +70,9 @@ public class ColumnInfoController {
     @Operation(summary = "获得栏目管理")
     @Parameter(name = "id", description = "编号", required = true, example = "1024")
     @PreAuthorize("@ss.hasPermission('cjy:column-info:query')")
-    public CommonResult<ColumnInfoRespVO> getColumnInfo(@RequestParam("id") Integer id) {
+    public CommonResult<ColumnInfoRespIndexVO> getColumnInfo(@RequestParam("id") Integer id) {
         ColumnInfoDO columnInfo = columnInfoService.getColumnInfo(id);
-        return success(BeanUtils.toBean(columnInfo, ColumnInfoRespVO.class));
+        return success(BeanUtils.toBean(columnInfo, ColumnInfoRespIndexVO.class));
     }
 
     @GetMapping("/page")

website-module-system/website-module-system-biz/src/main/java/com/cjy/website/module/system/controller/admin/columninfo/vo/ColumnInfoPageReqVO.java

@@ -21,6 +21,9 @@ public class ColumnInfoPageReqVO extends PageParam {
     @NotEmpty(message = "模块类型不能为空")
     private String type;
 
+    @Schema(description = "资讯类型（只有动态资讯模块填写）", example = "2")
+    private String infoType;
+
     @Schema(description = "标题")
     private String title;
 

website-module-system/website-module-system-biz/src/main/java/com/cjy/website/module/system/controller/admin/companyinfo/CompanyInfoController.java

@@ -13,6 +13,7 @@ import io.swagger.v3.oas.annotations.tags.Tag;
 import io.swagger.v3.oas.annotations.Parameter;
 import io.swagger.v3.oas.annotations.Operation;
 
+import javax.annotation.security.PermitAll;
 import javax.validation.constraints.*;
 import javax.validation.*;
 import javax.servlet.http.*;
@@ -67,7 +68,7 @@ public class CompanyInfoController {
     @GetMapping("/get")
     @Operation(summary = "获得公司信息")
     @Parameter(name = "id", description = "编号", required = true, example = "1024")
-    @PreAuthorize("@ss.hasPermission('cjy:company-info:query')")
+    @PermitAll
     public CommonResult<CompanyInfoRespVO> getCompanyInfo(@RequestParam("id") Integer id) {
         CompanyInfoDO companyInfo = companyInfoService.getCompanyInfo(id);
         return success(BeanUtils.toBean(companyInfo, CompanyInfoRespVO.class));

website-module-system/website-module-system-biz/src/main/java/com/cjy/website/module/system/controller/admin/companyinfo/vo/CompanyInfoRespVO.java

@@ -36,6 +36,12 @@ public class CompanyInfoRespVO {
     @ExcelProperty("公司logo")
     private String logo;
 
+    // 荣誉资质
+    private String honor;
+
+    //研发产品
+    private String product;
+
     @Schema(description = "创建时间", requiredMode = Schema.RequiredMode.REQUIRED)
     @ExcelProperty("创建时间")
     private LocalDateTime createTime;

website-module-system/website-module-system-biz/src/main/java/com/cjy/website/module/system/controller/admin/companyinfo/vo/CompanyInfoSaveReqVO.java

@@ -27,4 +27,11 @@ public class CompanyInfoSaveReqVO {
     @Schema(description = "公司logo")
     private String logo;
 
+    // 荣誉资质
+    private String honor;
+
+    //研发产品
+    private String product;
+
+
 }

website-module-system/website-module-system-biz/src/main/java/com/cjy/website/module/system/dal/dataobject/companyinfo/CompanyInfoDO.java

@@ -48,4 +48,10 @@ public class CompanyInfoDO extends BaseDO {
      */
     private String logo;
 
+    // 荣誉资质
+    private String honor;
+
+    //研发产品
+    private String product;
+
 }

website-module-system/website-module-system-biz/src/main/java/com/cjy/website/module/system/dal/mysql/columninfo/ColumnInfoMapper.java

@@ -20,6 +20,7 @@ public interface ColumnInfoMapper extends BaseMapperX<ColumnInfoDO> {
     default PageResult<ColumnInfoDO> selectPage(ColumnInfoPageReqVO reqVO) {
         return selectPage(reqVO, new LambdaQueryWrapperX<ColumnInfoDO>()
                 .eqIfPresent(ColumnInfoDO::getType, reqVO.getType())
+                .eqIfPresent(ColumnInfoDO::getInfoType, reqVO.getInfoType())
                 .eqIfPresent(ColumnInfoDO::getTitle, reqVO.getTitle())
                 .eqIfPresent(ColumnInfoDO::getSubtitle, reqVO.getSubtitle())
                 .orderByDesc(ColumnInfoDO::getRecommend)