springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/PartyBuildingApi.java
@@ -10,6 +10,7 @@ import com.panzhihua.common.model.vos.grid.EventGridCommunityAdminVO; import com.panzhihua.common.service.community.CommunityService; import com.panzhihua.common.service.partybuilding.ComPbCheckUnitFeign; import com.panzhihua.common.service.partybuilding.PartyBuildingWestService; import org.springframework.util.ObjectUtils; import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.*; @@ -47,6 +48,8 @@ @Resource private PartyBuildingService partyBuildingService; @Resource private PartyBuildingWestService partyBuildingWestService; @Resource private UserService userService; @Resource private CheckService checkService; @@ -73,7 +76,7 @@ return R.fail("类型不能为空"); } partyBuildingComPbDynVO.setStatus(2); return partyBuildingService.pageYnamic(partyBuildingComPbDynVO); return partyBuildingWestService.pageYnamic(partyBuildingComPbDynVO); } @ApiOperation(value = "分页查询党员活动", response = PageActivityMembersVO.class) springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/acid/ComActAcidCheckRecordVO.java
@@ -1,6 +1,8 @@ package com.panzhihua.common.model.vos.community.acid; import com.fasterxml.jackson.annotation.JsonFormat; import com.fasterxml.jackson.databind.annotation.JsonSerialize; import com.fasterxml.jackson.databind.ser.std.ToStringSerializer; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.AllArgsConstructor; @@ -26,6 +28,7 @@ private static final long serialVersionUID = 511018347419682300L; @JsonSerialize(using = ToStringSerializer.class) private Long id; /** springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/acid/ComActAcidDangerMemberVO.java
@@ -1,8 +1,6 @@ package com.panzhihua.common.model.vos.community.acid; import com.fasterxml.jackson.annotation.JsonFormat; import com.fasterxml.jackson.databind.annotation.JsonSerialize; import com.fasterxml.jackson.databind.ser.std.ToStringSerializer; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.AllArgsConstructor; springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/acid/ComActAcidMemberVO.java
@@ -1,5 +1,7 @@ package com.panzhihua.common.model.vos.community.acid; import com.fasterxml.jackson.databind.annotation.JsonSerialize; import com.fasterxml.jackson.databind.ser.std.ToStringSerializer; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.AllArgsConstructor; @@ -25,6 +27,7 @@ private static final long serialVersionUID = -88592294208705755L; @JsonSerialize(using = ToStringSerializer.class) private Long id; /** springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/acid/ComActAcidRecordTimeVO.java
@@ -1,6 +1,8 @@ package com.panzhihua.common.model.vos.community.acid; import com.fasterxml.jackson.annotation.JsonFormat; import com.fasterxml.jackson.databind.annotation.JsonSerialize; import com.fasterxml.jackson.databind.ser.std.ToStringSerializer; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; @@ -23,6 +25,7 @@ private static final long serialVersionUID = 681488919320181854L; @JsonSerialize(using = ToStringSerializer.class) private Long id; /** springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/community/acid/ComActAcidUpdateRecordVO.java
@@ -1,6 +1,8 @@ package com.panzhihua.common.model.vos.community.acid; import com.fasterxml.jackson.annotation.JsonFormat; import com.fasterxml.jackson.databind.annotation.JsonSerialize; import com.fasterxml.jackson.databind.ser.std.ToStringSerializer; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.AllArgsConstructor; @@ -26,6 +28,7 @@ private static final long serialVersionUID = -90587224071702612L; @JsonSerialize(using = ToStringSerializer.class) private Long id; /** springcloud_k8s_panzhihuazhihuishequ/community_backstage/src/main/java/com/panzhihua/community_backstage/api/CommunityPartyBuildingApi.java
@@ -607,6 +607,7 @@ if (null == id || 0 == id) { return R.fail("主键不能为空"); } comPbServiceTeamDTO.setAppid(this.getAppId()); comPbServiceTeamDTO.setCommunityId(null); return partyBuildingService.putServiceTeam(comPbServiceTeamDTO); } @@ -618,6 +619,7 @@ if (null == id || 0 == id) { return R.fail("主键不能为空"); } comPbServiceTeamDTO.setAppid(this.getAppId()); return partyBuildingService.deleteServiceTeam(comPbServiceTeamDTO); }
@@ -31,8 +31,8 @@ IPage<PartyCommitteeVO> pagePartyOrganization(Page page, @Param("partyCommitteeVO") PartyCommitteeVO partyCommitteeVO); @Select("select * from sys_user where phone=#{phone} and type=1") SysUserVO getSysUserByPhone(@Param("phone") String phone); @Select("select * from sys_user where phone=#{phone} AND app_id = #{appid} and type=1") SysUserVO getSysUserByPhone(@Param("phone") String phone, @Param("appid") String appid); /** * 根据身份证查询小程序用户id springcloud_k8s_panzhihuazhihuishequ/service_partybuilding/src/main/java/com/panzhihua/service_dangjian/service/impl/ComPbServiceTeamServiceImpl.java
@@ -84,9 +84,9 @@ ComPbServiceTeamDO oldComPbServiceTeam = comPbServiceTeamDAO.selectComPbServiceTeamById(comPbServiceTeamDTO.getId()); String oldphone = oldComPbServiceTeam.getPhone(); SysUserVO sysUserOld = comPbMemberRoleDAO.getSysUserByPhone(oldphone); SysUserVO sysUserOld = comPbMemberRoleDAO.getSysUserByPhone(oldphone, comPbServiceTeamDTO.getAppid()); String newphone = comPbServiceTeamDTO.getPhone(); SysUserVO sysUserNew = comPbMemberRoleDAO.getSysUserByPhone(newphone); SysUserVO sysUserNew = comPbMemberRoleDAO.getSysUserByPhone(newphone, comPbServiceTeamDTO.getAppid()); if (!ObjectUtils.isEmpty(sysUserOld) || !ObjectUtils.isEmpty(sysUserNew)) { comPbServiceTeamDO.setIsReg(1); } @@ -138,7 +138,7 @@ int delete = comPbServiceTeamDAO.deleteById(comPbServiceTeamDTO.getId()); if (delete > 0) { SysUserVO sysUserVO = comPbMemberRoleDAO.getSysUserByPhone(comPbServiceTeamDO.getPhone()); SysUserVO sysUserVO = comPbMemberRoleDAO.getSysUserByPhone(comPbServiceTeamDO.getPhone(), comPbServiceTeamDTO.getAppid()); // 删除用户信息缓存 if (sysUserVO != null) { Long userId = sysUserVO.getUserId();
