101captain
2022-01-04 8c60e0e3c58614a189b8682250054c38c130f4dc
1.4   河门口三社功能开发
4个文件已修改
20 ■■■■■ 已修改文件
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/LoginUserInfoVO.java 3 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/java/com/panzhihua/service_user/dao/UserDao.java 8 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/java/com/panzhihua/service_user/service/impl/UserServiceImpl.java 5 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/resources/mapper/UserDao.xml 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/LoginUserInfoVO.java
@@ -184,6 +184,9 @@
    @ApiModelProperty("是否社区工作人员 1.是 2.否")
    private Integer isCommunityWorker;
    @ApiModelProperty("是否社工 1.是 2.否")
    private Integer isSocialWorker;
    @ApiModelProperty("实名认证地址")
    private String address;
springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/java/com/panzhihua/service_user/dao/UserDao.java
@@ -218,4 +218,12 @@
     * @return
     */
    int countPropertyWorker(@Param("userId") Long userId, @Param("communityId") Long userCommunityId);
    /**
     * 查看是否社工
     * @param phone
     * @param communityId
     * @return
     */
    int countSocialWorker(@Param("phone") String phone, @Param("communityId") Long communityId);
}
springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/java/com/panzhihua/service_user/service/impl/UserServiceImpl.java
@@ -358,6 +358,7 @@
        loginUserInfoVO.setIsFourMember(2);
        loginUserInfoVO.setIsCommunityWorker(2);
        loginUserInfoVO.setIsPropertyWorker(2);
        loginUserInfoVO.setIsSocialWorker(2);
        // 志愿者状态
        String phone = sysUserDO.getPhone();
        Long userCommunityId = sysUserDO.getCommunityId();
@@ -397,6 +398,10 @@
            } else if (isSysUser != null && isSysUser > 0) {
                loginUserInfoVO.setIsmemberrole(1);
            }
            Integer countSocialWorker = userDao.countSocialWorker(phone,userCommunityId);
            if(countSocialWorker>0){
                loginUserInfoVO.setIsSocialWorker(1);
            }
        }
        loginUserInfoVO.setIsRealNamed(sysUserDO.getIdCard() != null);
        return R.ok(loginUserInfoVO);
springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/resources/mapper/UserDao.xml
@@ -524,4 +524,8 @@
        WHERE user_id = #{userId} AND community_id = #{communityId}
    </select>
    <select id="countSocialWorker" resultType="integer">
        select count(id) from com_act_social_worker where telephone = #{phone} and community_id = #{communityId}
    </select>
</mapper>