diff --git a/src/main/java/com/gxwebsoft/cms/service/impl/DomainServiceImpl.java b/src/main/java/com/gxwebsoft/cms/service/impl/DomainServiceImpl.java index 1c11d1a..387b29f 100644 --- a/src/main/java/com/gxwebsoft/cms/service/impl/DomainServiceImpl.java +++ b/src/main/java/com/gxwebsoft/cms/service/impl/DomainServiceImpl.java @@ -23,7 +23,7 @@ public class DomainServiceImpl extends ServiceImpl impleme @Override public PageResult pageRel(DomainParam param) { PageParam page = new PageParam<>(param); - page.setDefaultOrder("status desc,create_time desc"); + page.setDefaultOrder("sort_number asc, status desc,create_time desc"); List list = baseMapper.selectPageRel(page, param); return new PageResult<>(list, page.getTotal()); } @@ -33,7 +33,7 @@ public class DomainServiceImpl extends ServiceImpl impleme List list = baseMapper.selectListRel(param); // 排序 PageParam page = new PageParam<>(); - page.setDefaultOrder("status desc,create_time desc"); + page.setDefaultOrder("sort_number asc, status desc,create_time desc"); return page.sortRecords(list); } diff --git a/src/main/java/com/gxwebsoft/oa/controller/AppController.java b/src/main/java/com/gxwebsoft/oa/controller/AppController.java index b927e79..f238ccb 100644 --- a/src/main/java/com/gxwebsoft/oa/controller/AppController.java +++ b/src/main/java/com/gxwebsoft/oa/controller/AppController.java @@ -1,5 +1,6 @@ package com.gxwebsoft.oa.controller; +import cn.hutool.core.util.DesensitizedUtil; import cn.hutool.core.util.StrUtil; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.gxwebsoft.common.core.utils.CommonUtil; @@ -19,7 +20,10 @@ import io.swagger.annotations.ApiOperation; import org.springframework.web.bind.annotation.*; import javax.annotation.Resource; -import java.util.*; +import java.util.HashMap; +import java.util.List; +import java.util.Map; +import java.util.Set; import java.util.stream.Collectors; import static com.gxwebsoft.common.core.constants.AppUserConstants.ADMINISTRATOR; @@ -78,6 +82,10 @@ public class AppController extends BaseController { @GetMapping("/page") public ApiResult> page(AppParam param) { final User loginUser = getLoginUser(); + // 未登录情况 + if(loginUser == null){ + return success("案例列表",caseList(param)); + } final Integer userId = loginUser.getUserId(); loginUser.getRoles().forEach(d -> { if(!StrUtil.equals(d.getRoleCode(),"superAdmin") && !StrUtil.equals(d.getRoleCode(),"admin")){ @@ -96,6 +104,16 @@ public class AppController extends BaseController { return success(appService.pageRel(param)); } + // 读取案例列表 + private PageResult caseList(AppParam param){ + param.setShowCase(true); + final PageResult appPageResult = appService.pageRel(param); + appPageResult.getList().forEach(d -> { + d.setContent(null); + }); + return appPageResult; + } + @ApiOperation("查询全部应用管理记录表") @GetMapping() public ApiResult> list(AppParam param) { @@ -107,6 +125,10 @@ public class AppController extends BaseController { @GetMapping("/{id}") public ApiResult get(@PathVariable("id") Integer id) { final User loginUser = getLoginUser(); + // 未登录情况 + if(loginUser == null){ + return success("案例详情",getDesensitizedApp(id)); + } if (!CommonUtil.hasRole(loginUser.getRoles(),"superAdmin") && !CommonUtil.hasRole(loginUser.getRoles(),"admin")) { // 查询权限 if (appUserService.count(new LambdaQueryWrapper().eq(AppUser::getUserId, getLoginUserId()).eq(AppUser::getAppId,id)) == 0) { @@ -117,7 +139,16 @@ public class AppController extends BaseController { return success(appService.getByIdRel(id)); } - @ApiOperation("添加应用管理记录表") + private App getDesensitizedApp(Integer id) { + final App app = appService.getByIdRel(id); + app.setPhone(DesensitizedUtil.mobilePhone(app.getPhone())); + app.setCompanyName( + StrUtil.hide(app.getCompanyName(), 2, app.getCompanyName().length() - 2)); + app.setRequirement(DesensitizedUtil.chineseName(app.getCompanyName())); + return app; + } + + @ApiOperation("添加应用管理记录表") @PostMapping() public ApiResult save(@RequestBody App app) { // 记录当前登录用户id、租户id、商户编号 diff --git a/src/main/java/com/gxwebsoft/oa/entity/App.java b/src/main/java/com/gxwebsoft/oa/entity/App.java index 0046e29..60b669f 100644 --- a/src/main/java/com/gxwebsoft/oa/entity/App.java +++ b/src/main/java/com/gxwebsoft/oa/entity/App.java @@ -198,6 +198,9 @@ public class App implements Serializable { @ApiModelProperty(value = "应用状态") private String appStatus; + @ApiModelProperty(value = "是否作为案例展示") + private Boolean showCase; + @ApiModelProperty(value = "排序(数字越小越靠前)") private Integer sortNumber; diff --git a/src/main/java/com/gxwebsoft/oa/mapper/xml/AppMapper.xml b/src/main/java/com/gxwebsoft/oa/mapper/xml/AppMapper.xml index cdaf2f9..0f93882 100644 --- a/src/main/java/com/gxwebsoft/oa/mapper/xml/AppMapper.xml +++ b/src/main/java/com/gxwebsoft/oa/mapper/xml/AppMapper.xml @@ -17,6 +17,9 @@ AND a.app_code LIKE CONCAT('%', #{param.appCode}, '%') + + AND a.show_case = #{param.showCase} + AND a.parent_id = #{param.parentId} diff --git a/src/main/java/com/gxwebsoft/oa/param/AppParam.java b/src/main/java/com/gxwebsoft/oa/param/AppParam.java index 32a598b..0a2c074 100644 --- a/src/main/java/com/gxwebsoft/oa/param/AppParam.java +++ b/src/main/java/com/gxwebsoft/oa/param/AppParam.java @@ -221,4 +221,8 @@ public class AppParam extends BaseParam { @TableField(exist = false) private Set appIds; + @ApiModelProperty(value = "是否作为案例展示") + @TableField(exist = false) + private Boolean showCase; + }