花城-智慧社区
parent: 9cc2be00 | 补丁 | 提交 | ignore whitespace
CeDo
2021-05-08 d4ff86377dc230f9fa618d5a6c525f94ae223477 
bugfixed: 店铺修改密码失败
2个文件已修改
6 ■■■■■ 已修改文件
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/shop/ShopStoreVO.java 2 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActServiceImpl.java 4 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 
 springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/shop/ShopStoreVO.java


@@ -38,7 +38,7 @@






    @ApiModelProperty("店铺登陆账号")


    @Pattern(groups = {AddGroup.class}, message="【密码】格式为6-16个字符，英文，数字，且必须包含英文和数字",regexp="^(?![0-9]+$)(?![a-zA-Z]+$)[0-9A-Za-z]{6,16}$")


    //@Pattern(groups = {AddGroup.class}, message="【密码】格式为6-16个字符，英文，数字，且必须包含英文和数字",regexp="^(?![0-9]+$)(?![a-zA-Z]+$)[0-9A-Za-z]{6,16}$")


    @NotBlank(message = "店铺登陆账号不能为空")


    private String storeAccount;






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


@@ -166,7 +166,9 @@


     */


    @Override


    public R listCommunityAll() {


        List<ComActDO> comActDOS = comActDAO.selectList(new QueryWrapper<ComActDO>().lambda().eq(ComActDO::getState, 0).orderByDesc(ComActDO::getCreateAt));


        List<ComActDO> comActDOS = comActDAO.selectList(new QueryWrapper<ComActDO>().lambda().eq(ComActDO::getState, 0)


                .eq(ComActDO::getCityCode, "510400")


                .orderByDesc(ComActDO::getCreateAt));


        List<ComActVO> comActVOS = new ArrayList<>();


        if (!ObjectUtils.isEmpty(comActDOS)) {


            comActDOS.forEach(comActDO -> {