springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/CommunityApi.java
@@ -134,7 +134,6 @@ comActActivityVO.setCommunityId(loginUserInfo.getCommunityId()); } comActActivityVO.setIsApplets(1); comActActivityVO.setAreaCode(this.getAreaCode()); Integer status = comActActivityVO.getStatus(); if (null != status && status.intValue() == 4) { comActActivityVO.setIsIng(1); springcloud_k8s_panzhihuazhihuishequ/community_backstage/src/main/java/com/panzhihua/community_backstage/api/CommunityPartyBuildingApi.java
@@ -25,6 +25,7 @@ import com.panzhihua.common.model.vos.partybuilding.excel.ComPbMemberRoleErrorExcelVo; import com.panzhihua.common.model.vos.user.SysTemplateConfigVO; import com.panzhihua.common.service.partybuilding.ComDataStatisticsFeign; import com.panzhihua.common.service.partybuilding.PartyBuildingWestService; import com.panzhihua.common.utlis.*; import com.panzhihua.community_backstage.config.MinioUtil; import com.panzhihua.community_backstage.config.SFTPConfig; @@ -91,6 +92,8 @@ private static List<String> videoExtensionAllow = Arrays.asList("mp4", "mov"); @Resource private PartyBuildingService partyBuildingService; @Resource private PartyBuildingWestService partyBuildingWestService; @Resource private CommunityService communityService; @Resource @@ -537,7 +540,7 @@ if (l >= time) { partyCommitteeVO.setStatus(2); } return partyBuildingService.adddYnamic(partyCommitteeVO); return partyBuildingWestService.adddYnamic(partyCommitteeVO); } @ApiOperation(value = "编辑动态/政策文件") @@ -547,7 +550,7 @@ if (null == id || 0 == id) { return R.fail("动态主键不能为空"); } return partyBuildingService.updateYnamic(partyCommitteeVO); return partyBuildingWestService.updateYnamic(partyCommitteeVO); } @ApiOperation(value = "动态/政策文件详情", response = PartyBuildingComPbDynVO.class) @@ -565,7 +568,7 @@ } Long communityId = this.getCommunityId(); partyBuildingComPbDynVO.setCommunityId(communityId); return partyBuildingService.pageYnamic(partyBuildingComPbDynVO); return partyBuildingWestService.pageYnamic(partyBuildingComPbDynVO); } @ApiOperation(value = "删除动态/政策文件") @@ -575,7 +578,7 @@ if (null == id || 0 == id) { return R.fail("动态主键不能为空"); } return partyBuildingService.deleteYnamic(id); return partyBuildingWestService.deleteYnamic(id); } @OperLog(operModul = "党员管理", operType = 3) springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/entity/ComActEasyPhotoHandler.java
@@ -3,6 +3,9 @@ import java.io.Serializable; import java.util.Date; import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; import lombok.Data; /** @@ -12,11 +15,13 @@ * @since 2022-03-01 13:45:11 */ @Data @TableName(value = "com_act_easy_photo_handle") public class ComActEasyPhotoHandler implements Serializable { private static final long serialVersionUID = -15137895736835383L; /** * 主键id */ @TableId(type = IdType.ASSIGN_ID) private Long id; /** * 社区id springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/resources/mapper/ComActEasyPhotoDOMapper.xml
@@ -538,7 +538,7 @@ AND p.sponsor_id = #{comActEasyPhotoVO.sponsorId} </if> <if test='comActEasyPhotoVO.sponsorId == null or comActEasyPhotoVO.sponsorId==0'> AND p.`status` in (2,4) AND p.`status` in (2,5) <if test="comActEasyPhotoVO.isFeedBackForDpc == null or comActEasyPhotoVO.isDpcMember == 0"> AND p.is_publicity = 1 </if> springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/resources/mapper/ComActIntegralUserDOMapper.xml
@@ -36,7 +36,7 @@ ca.`name` AS communityName FROM com_act_integral_user AS caiu LEFT JOIN com_act AS ca ON ca.community_id = caiu.community_id Inner JOIN com_act AS ca ON ca.community_id = caiu.community_id WHERE caiu.user_id = #{userId} and caiu.community_id !=11 </select>
