From d0734d1b6bfe16e93d62f33f3df3431fc3ad8c77 Mon Sep 17 00:00:00 2001
From: 罗元桥 <2376770955@qq.com>
Date: 星期日, 26 九月 2021 13:51:39 +0800
Subject: [PATCH] Merge branch 'test_bak' into 'master'
---
springcloud_k8s_panzhihuazhihuishequ/grid_backstage/src/main/java/com/panzhihua/grid_backstage/api/EasyPhotoApi.java | 6 +++---
1 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/springcloud_k8s_panzhihuazhihuishequ/grid_backstage/src/main/java/com/panzhihua/grid_backstage/api/EasyPhotoApi.java b/springcloud_k8s_panzhihuazhihuishequ/grid_backstage/src/main/java/com/panzhihua/grid_backstage/api/EasyPhotoApi.java
index a1092d5..0193282 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/grid_backstage/src/main/java/com/panzhihua/grid_backstage/api/EasyPhotoApi.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/grid_backstage/src/main/java/com/panzhihua/grid_backstage/api/EasyPhotoApi.java
@@ -38,7 +38,7 @@
// if(easyAppDTO.getCommunityId() == null){
// easyAppDTO.setCommunityId(userInfoVO.getCommunityId());
// }
- if(easyAppDTO != null && easyAppDTO.getIsPublicity().equals(0)){
+ if(easyAppDTO != null && easyAppDTO.getIsPublicity() != null && easyAppDTO.getIsPublicity().equals(0)){
easyAppDTO.setIsPublicity(2);
}
return gridService.easyListByAdmin(easyAppDTO);
@@ -67,7 +67,7 @@
return R.fail("请先登录");
}
photoHandleDTO.setHandlerId(userInfoVO.getUserId());
- if(photoHandleDTO.getIsPublicity().equals(0)){
+ if(photoHandleDTO.getIsPublicity() != null && photoHandleDTO.getIsPublicity().equals(0)){
photoHandleDTO.setIsPublicity(2);
}
return gridService.easyHandleByAdmin(photoHandleDTO);
@@ -76,7 +76,7 @@
@ApiOperation(value = "随手拍切换公示状态-lyq")
@PostMapping("publicity")
public R publicity(@RequestBody ComActEasyPhotoEditAdminDTO photoHandleDTO) {
- if(photoHandleDTO != null && photoHandleDTO.getIsPublicity().equals(0)){
+ if(photoHandleDTO != null && photoHandleDTO.getIsPublicity() != null && photoHandleDTO.getIsPublicity().equals(0)){
photoHandleDTO.setIsPublicity(2);
}
return gridService.easyPublicityByAdmin(photoHandleDTO);
--
Gitblit v1.7.1