fengjin
2023-09-19 2bd9debe1829fdce93c62028aa97716a1cb2defe
springcloud_k8s_panzhihuazhihuishequ/service_equipment/src/main/java/com/panzhihua/service_equipment/api/UnionReportApi.java
@@ -2,7 +2,9 @@
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.panzhihua.common.model.dtos.equipment.UnionReportDto;
import com.panzhihua.common.model.dtos.equipment.UnionUserDto;
import com.panzhihua.common.model.vos.R;
import com.panzhihua.service_equipment.annotation.CurrentUser;
import com.panzhihua.service_equipment.model.dos.UnionReport;
import com.panzhihua.service_equipment.service.UnionReportService;
import lombok.extern.slf4j.Slf4j;
@@ -28,8 +30,19 @@
     * @return 新增结果
     */
    @PostMapping("/add")
    public R add(@RequestBody UnionReportDto unionReportDto) {
        return  unionReportService.add(unionReportDto);
    public R add(@RequestBody UnionReportDto unionReportDto, @CurrentUser UnionUserDto unionUserDto) {
        if (unionReportDto.getIsApplets().equals(1)) {
            log.info("小程序进入无需验证");
            return unionReportService.add(unionReportDto);
        } else {
            log.info("h5或者后台进入");
            if (unionUserDto != null) {
                unionReportDto.setCreateUnionUserId(unionUserDto.getId());
                return unionReportService.add(unionReportDto);
            } else {
                return R.fail("请重新登录");
            }
        }
    }
@@ -40,7 +53,19 @@
     * @return 动态结果
     */
    @PostMapping("/query")
    public R<IPage<UnionReport>> query(@RequestBody UnionReportDto unionReportDto) {
        return unionReportService.query(unionReportDto);
    public R<IPage<UnionReport>> query(@RequestBody UnionReportDto unionReportDto, @CurrentUser UnionUserDto
            unionUserDto) {
        if (unionReportDto.getIsApplets().equals(1)) {
            log.info("小程序进入无需验证");
            return unionReportService.query(unionReportDto);
        } else {
            log.info("h5或者后台进入");
            if (unionUserDto != null) {
                unionReportDto.setCreateUnionUserId(unionUserDto.getId());
                return unionReportService.query(unionReportDto);
            } else {
                return R.fail("请重新登录");
            }
        }
    }
}