springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/LoginUserInfoVO.java
@@ -178,4 +178,7 @@ @ApiModelProperty("高龄认证显示提示(1.是 2.否)") private Integer bigAgeTips; @ApiModelProperty("是否四长四员 1.是 2.否") private Integer isFourMember; } springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/java/com/panzhihua/service_user/dao/ComActFourMemberDao.java
New file @@ -0,0 +1,21 @@ package com.panzhihua.service_user.dao; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.panzhihua.common.model.dtos.property.CommonPage; import com.panzhihua.common.model.vos.community.ComActFourMemberVO; import com.panzhihua.service_user.model.dos.ComActFourMember; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; /** * (ComActFourMember)表数据库访问层 * * @author makejava * @since 2021-09-23 10:13:30 */ @Mapper public interface ComActFourMemberDao extends BaseMapper<ComActFourMember> { } springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/java/com/panzhihua/service_user/model/dos/ComActFourMember.java
New file @@ -0,0 +1,72 @@ package com.panzhihua.service_user.model.dos; import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableId; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.AllArgsConstructor; import lombok.Builder; import lombok.Data; import lombok.NoArgsConstructor; import java.io.Serializable; import java.util.Date; /** * (ComActFourMember)表实体类 * * @author makejava * @since 2021-09-23 10:13:30 */ @Data @Builder @AllArgsConstructor @NoArgsConstructor @ApiModel("") public class ComActFourMember implements Serializable { private static final long serialVersionUID = 905771115750112478L; @TableId(type = IdType.AUTO) private Integer id; /** * 用户id */ @ApiModelProperty(value = "用户id") private Long userId; /** * 职位 */ @ApiModelProperty(value = "职位") private String position; /** * 管辖区域 */ @ApiModelProperty(value = "管辖区域") private String jurisdiction; /** * 社区id */ @ApiModelProperty(value = "社区id") private Long communityId; /** * 创建时间 */ @ApiModelProperty(value = "创建时间") private Date createTime; @ApiModelProperty(value = "管辖区域内容") private String jurisdictionContent; @ApiModelProperty(value = "照片") private String url; private String password; } springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/java/com/panzhihua/service_user/service/impl/UserServiceImpl.java
@@ -14,6 +14,8 @@ import javax.annotation.Resource; import com.panzhihua.service_user.dao.*; import com.panzhihua.service_user.model.dos.*; import org.apache.commons.lang.time.DateFormatUtils; import org.apache.commons.lang.time.DateUtils; import org.springframework.beans.BeanUtils; @@ -81,34 +83,6 @@ import com.panzhihua.common.utlis.StringUtils; import com.panzhihua.common.utlis.WxUtil; import com.panzhihua.common.utlis.WxXCXTempSend; import com.panzhihua.service_user.dao.ComMngFamilyInfoDAO; import com.panzhihua.service_user.dao.ComMngUserTagDAO; import com.panzhihua.service_user.dao.EventGridMemberBuildingRelationMapper; import com.panzhihua.service_user.dao.LcCompareMemberCodeMapper; import com.panzhihua.service_user.dao.RoleDAO; import com.panzhihua.service_user.dao.SysMenuDAO; import com.panzhihua.service_user.dao.SysOperLogDAO; import com.panzhihua.service_user.dao.SysRoleMenuDAO; import com.panzhihua.service_user.dao.SysUserAgreementDAO; import com.panzhihua.service_user.dao.SysUserFeedbackDAO; import com.panzhihua.service_user.dao.SysUserInputDAO; import com.panzhihua.service_user.dao.SysUserNoticeDAO; import com.panzhihua.service_user.dao.SysUserRoleDAO; import com.panzhihua.service_user.dao.UserDao; import com.panzhihua.service_user.model.dos.ComMngFamilyInfoDO; import com.panzhihua.service_user.model.dos.ComMngUserTagDO; import com.panzhihua.service_user.model.dos.EventGridMemberBuildingRelationDO; import com.panzhihua.service_user.model.dos.LcCompareCodeMemberDO; import com.panzhihua.service_user.model.dos.SysMenuDO; import com.panzhihua.service_user.model.dos.SysOperLogDO; import com.panzhihua.service_user.model.dos.SysRoleDO; import com.panzhihua.service_user.model.dos.SysRoleMenuDO; import com.panzhihua.service_user.model.dos.SysUserAgreementDO; import com.panzhihua.service_user.model.dos.SysUserDO; import com.panzhihua.service_user.model.dos.SysUserFeedbackDO; import com.panzhihua.service_user.model.dos.SysUserInputDO; import com.panzhihua.service_user.model.dos.SysUserNoticeDO; import com.panzhihua.service_user.model.dos.SysUserRoleDO; import com.panzhihua.service_user.model.dtos.DataKanbanDTO; import com.panzhihua.service_user.service.EventGridMemberBuildingRelationService; import com.panzhihua.service_user.service.UserService; @@ -158,6 +132,8 @@ private EventGridMemberBuildingRelationMapper eventGridMemberBuildingRelationMapper; @Resource private LcCompareMemberCodeMapper lcCompareMemberCodeMapper; @Resource private ComActFourMemberDao comActFourMemberDao; // @Resource // private GridService gridService; @@ -363,6 +339,14 @@ int state = comMngVolunteerMngVO.getState().intValue(); loginUserInfoVO.setVolunteerStatus(state); } //是否四长四员 Integer countFourMember=comActFourMemberDao.selectCount(new QueryWrapper<ComActFourMember>().lambda().eq(ComActFourMember::getUserId,sysUserDO.getUserId())); if(countFourMember>0){ loginUserInfoVO.setIsFourMember(1); } else { loginUserInfoVO.setIsFourMember(2); } // 是否是"管理员"或者 本社区 "社区团队"、"党委成员" Integer countTeam = userDao.selectCountTeam(phone, userCommunityId); Integer selectCountMemberRole = userDao.selectCountMemberRole(phone, userCommunityId); springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/resources/mapper/ComActFourMemberMapper.xml
New file @@ -0,0 +1,14 @@ <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd"> <mapper namespace="com.panzhihua.service_user.dao.ComActFourMemberDao"> <resultMap type="com.panzhihua.service_user.model.dos.ComActFourMember" id="ComActFourMemberBaseResultMap"> <result property="id" column="id"/> <result property="userId" column="user_id"/> <result property="position" column="position"/> <result property="jurisdiction" column="jurisdiction"/> <result property="communityId" column="community_id"/> <result property="createTime" column="create_time"/> <result property="jurisdictionContent" column="jurisdiction_content"/> </resultMap> </mapper>