修改标签设置bug

tangxiaobao

2021-09-10 5aec0d41b496803b4d11c8f75d161d8596f79d37

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

@@ -458,8 +458,21 @@
        IPage<AppletUserInfoVO> iPage =
            userDao.pageUser(new Page<>(userInfoVO.getPageNum(), userInfoVO.getPageSize()), userInfoVO);
        iPage.getRecords().forEach(record -> {
            record.setPhone(SensitiveUtil.desensitizedPhoneNumber(record.getPhone()));
//            record.setPhone(SensitiveUtil.desensitizedPhoneNumber(record.getPhone()));
            record.setIdCard(SensitiveUtil.desensitizedIdNumber(record.getIdCard()));

//            StringBuilder sb = new StringBuilder();
            if (record.getIsPartymember().equals(1)) {
                record.setTags(record.getTags()+ "党员,");
            }
            if (record.getIsVolunteer().equals(1)) {
                record.setTags(record.getTags()+ "志愿者,");
            }
            if (record.getTags().length() > 0) {
                record.setTags(record.getTags().substring(0, record.getTags().length() - 1));
            } else {
                record.setTags("无");
            }
        });
        return R.ok(iPage);
    }
@@ -565,7 +578,7 @@
        SysUserDO sysUserDO = new SysUserDO();
        sysUserDO.setUserId(loginUserInfoVO.getUserId());
        sysUserDO.setTags(loginUserInfoVO.getTags());
        int update = userDao.updateById(sysUserDO);
        int update = userDao.putUserTag(sysUserDO);
        if (update > 0) {
            return R.ok();
        }
@@ -1293,7 +1306,7 @@
        Long communityId = systemmanagementConfigVO.getCommunityId();
        List<ComMngUserTagVO> comMngUserTagVOList = systemmanagementConfigVO.getComMngUserTagVOList();
        if (!ObjectUtils.isEmpty(comMngUserTagVOList)) {
            comMngUserTagDAO.delete(null);
            comMngUserTagDAO.delete(new QueryWrapper<ComMngUserTagDO>().lambda().eq(ComMngUserTagDO::getCommunityId,communityId));
            comMngUserTagVOList.forEach(comMngUserTagVO -> {
                ComMngUserTagDO comMngUserTagDO = new ComMngUserTagDO();
                comMngUserTagDO.setCommunityId(communityId);
@@ -1820,13 +1833,18 @@
     * @return 标签集合
     */
    @Override
    public R listTags(Long communityId) {
    public R listTags() {
        List<String> list = new ArrayList<>();
        List<ComMngUserTagDO> comMngUserTagDOS = comMngUserTagDAO
            .selectList(new QueryWrapper<ComMngUserTagDO>().eq("sys_flag", 1).or().eq("community_id", communityId));
            .selectList(null);
        if (!ObjectUtils.isEmpty(comMngUserTagDOS)) {
            list = comMngUserTagDOS.stream().map(comMngUserTagDO -> comMngUserTagDO.getTagName())
                .collect(Collectors.toList());
            for (ComMngUserTagDO comMngUserTagDO : comMngUserTagDOS) {
                if (!list.contains(comMngUserTagDO.getTagName())) {
                    list.add(comMngUserTagDO.getTagName());
                }
            }
//            list = comMngUserTagDOS.stream().map(comMngUserTagDO -> comMngUserTagDO.getTagName())
//                .collect(Collectors.toList());
        }
        return R.ok(list);
    }