Merge remote-tracking branch 'origin/master'

CeDo

2021-04-27 e088d1f0787a46210bd28ced2771d91545f97630

Merge remote-tracking branch 'origin/master'

 springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/user/CommunityUserInfoVO.java

@@ -88,7 +88,23 @@
    @ApiModelProperty("近一个月离（返）攀情况")
    private String situation;

    /**
     * 证件照（人面像）照片
     */
    @ApiModelProperty("证件照（人面像）照片")
    private String cardPhotoFront;

    /**
     * 证件照（国徽面）照片
     */
    @ApiModelProperty("证件照（国徽面）照片")
    private String cardPhotoBack;

    /**
     * 户口本照片(多张以,号隔开)
     */
    @ApiModelProperty("户口本照片(多张以,号隔开)")
    private String familyBook;




 springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/user/UserArchivesVO.java

@@ -16,6 +16,9 @@
    @ApiModelProperty("用户id")
    private Long userId;

    @ApiModelProperty("真实名字")
    private String name;

    @ApiModelProperty("身份证号")
    private String idCard;

@@ -23,7 +26,7 @@
    @ApiModelProperty("性别 1 男 2 女")
    private Integer sex;

    @ApiModelProperty("生日")
    @ApiModelProperty("出生年月")
    private Date birthday;

    @ApiModelProperty("职业")

 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActWorkGuideServiceImpl.java

@@ -83,12 +83,12 @@
                    if (workGuideMaterialDO1 != null) {//2、如果db有,执行编辑
                        workGuideMaterialDO1.setMaterialName(materialsVO.getMaterialName());
                        workGuideMaterialDAO.updateById(workGuideMaterialDO1);
                    } else {//3、如果db没有，执行新增
                        ComActWorkGuideMaterialDO newWorkGuideMaterialDO = new ComActWorkGuideMaterialDO();
                        newWorkGuideMaterialDO.setMaterialName(materialsVO.getMaterialName());
                        newWorkGuideMaterialDO.setWorkGuideId(workGuideDO.getId());
                        workGuideMaterialDAO.insert(newWorkGuideMaterialDO);
                    }
                } else {//3、如果db没有，执行新增
                    ComActWorkGuideMaterialDO newWorkGuideMaterialDO = new ComActWorkGuideMaterialDO();
                    newWorkGuideMaterialDO.setMaterialName(materialsVO.getMaterialName());
                    newWorkGuideMaterialDO.setWorkGuideId(workGuideDO.getId());
                    workGuideMaterialDAO.insert(newWorkGuideMaterialDO);
                }
            });
        }
@@ -136,6 +136,6 @@
        this.baseMapper.deleteById(workGuideId);
        workGuideMaterialDAO.delete(new LambdaQueryWrapper<ComActWorkGuideMaterialDO>()
                .eq(ComActWorkGuideMaterialDO::getWorkGuideId, workGuideId));
        return  R.ok();
        return R.ok();
    }
}

 springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/java/com/panzhihua/service_user/dao/UserDao.java

@@ -161,7 +161,7 @@
            "from sys_user u\n" +
            "left join com_act a on u.community_id=a.community_id\n" +
            " where\n" +
            "u.type=1\n" +
            "u.type=1 and u.community_id is not null \n" +
            "<if test='pageUserAppletsBackstageDTO.phone != null and pageUserAppletsBackstageDTO.phone.trim() != &quot;&quot;'>" +
            "and u.phone=#{pageUserAppletsBackstageDTO.phone}\n" +
            " </if> " +

 springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/java/com/panzhihua/service_user/service/impl/UserServiceImpl.java

@@ -1505,6 +1505,9 @@
                communityUserInfoVO.setIdCard(idCard);
            }
            communityUserInfoVO.setCreateAt(sysUserDO.getCreateAt());
            communityUserInfoVO.setCardPhotoBack(sysUserDO.getCardPhotoBack());
            communityUserInfoVO.setCardPhotoFront(sysUserDO.getCardPhotoFront());
            communityUserInfoVO.setFamilyBook(sysUserDO.getFamilyBook());
            communityUserInfoVO.setName(sysUserDO.getName());
            String phone = sysUserDO.getPhone();
            communityUserInfoVO.setPhone(phone);