diff --git a/common-ruoyi/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/Dept.java b/common-ruoyi/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/Dept.java index 27c0e87..0e91cb4 100644 --- a/common-ruoyi/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/Dept.java +++ b/common-ruoyi/ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/Dept.java @@ -43,8 +43,8 @@ public class Dept extends BaseEntity /** 负责人 */ private String leader; - /** 联系电话 */ - @Size(min = 0, max = 11, message = "联系电话长度不能超过11个字符") + /** 联系联系方式 */ + @Size(min = 0, max = 11, message = "联系联系方式长度不能超过11个字符") private String phone; /** 邮箱 */ diff --git a/common-ruoyi/ruoyi-common/src/main/java/com/ruoyi/common/utils/RegexpUtils.java b/common-ruoyi/ruoyi-common/src/main/java/com/ruoyi/common/utils/RegexpUtils.java index 7f71d2d..12e16b2 100644 --- a/common-ruoyi/ruoyi-common/src/main/java/com/ruoyi/common/utils/RegexpUtils.java +++ b/common-ruoyi/ruoyi-common/src/main/java/com/ruoyi/common/utils/RegexpUtils.java @@ -124,7 +124,7 @@ public final class RegexpUtils { public static final String DATE_SLASH_REGEXP = "^[0-9]{4}\\.[0-9]{2}\\.[0-9]{2}$"; /** - * 匹配电话 + * 匹配联系方式 *

*

* 格式为: 0XXX-XXXXXX(10-13位首位必须为0) 或0XXX XXXXXXX(10-13位首位必须为0) 或 diff --git a/ruoyi-service/src/main/java/com/ruoyi/bst/ad/mapper/AdMapper.xml b/ruoyi-service/src/main/java/com/ruoyi/bst/ad/mapper/AdMapper.xml index da74527..2b7e83f 100644 --- a/ruoyi-service/src/main/java/com/ruoyi/bst/ad/mapper/AdMapper.xml +++ b/ruoyi-service/src/main/java/com/ruoyi/bst/ad/mapper/AdMapper.xml @@ -20,27 +20,27 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" select - ad_id, - type, - picture, - url, - create_by, - create_time, - update_by, - update_time, - remark, - deleted, - url_type - from bst_ad + bad.ad_id, + bad.type, + bad.picture, + bad.url, + bad.create_by, + bad.create_time, + bad.update_by, + bad.update_time, + bad.remark, + bad.deleted, + bad.url_type + from bst_ad bad - and ad_id = #{query.adId} - and type = #{query.type} - and picture = #{query.picture} - and url = #{query.url} - and deleted = #{query.deleted} - and url_type = #{query.urlType} + and bad.ad_id = #{query.adId} + and bad.type = #{query.type} + and bad.picture = #{query.picture} + and bad.url = #{query.url} + and bad.deleted = #{query.deleted} + and bad.url_type = #{query.urlType} ${query.params.dataScope} diff --git a/ruoyi-service/src/main/java/com/ruoyi/bst/area/domain/Area.java b/ruoyi-service/src/main/java/com/ruoyi/bst/area/domain/Area.java index 5d12d5d..cc5b6dc 100644 --- a/ruoyi-service/src/main/java/com/ruoyi/bst/area/domain/Area.java +++ b/ruoyi-service/src/main/java/com/ruoyi/bst/area/domain/Area.java @@ -59,8 +59,8 @@ public class Area extends BaseEntity @ApiModelProperty("联系人") private String contact; - @Excel(name = "联系电话") - @ApiModelProperty("联系电话") + @Excel(name = "联系联系方式") + @ApiModelProperty("联系联系方式") private String phone; @Excel(name = "运营区状态：0-运营中；1-停运") diff --git a/ruoyi-service/src/main/java/com/ruoyi/bst/article/mapper/ArticleMapper.java b/ruoyi-service/src/main/java/com/ruoyi/bst/article/mapper/ArticleMapper.java index c93f16e..05ce669 100644 --- a/ruoyi-service/src/main/java/com/ruoyi/bst/article/mapper/ArticleMapper.java +++ b/ruoyi-service/src/main/java/com/ruoyi/bst/article/mapper/ArticleMapper.java @@ -73,7 +73,7 @@ public interface ArticleMapper */ public int deleteArticleByIds(Long[] ids); - public ArticleVO selectChildrenByiId(Long id); + public ArticleVO selectChildrenById(Long id); ArticleVO selectArticleByCode(ArticleCategoryQuery articleCategoryQuery); } diff --git a/ruoyi-service/src/main/java/com/ruoyi/bst/article/mapper/ArticleMapper.xml b/ruoyi-service/src/main/java/com/ruoyi/bst/article/mapper/ArticleMapper.xml index 0234b45..eecb602 100644 --- a/ruoyi-service/src/main/java/com/ruoyi/bst/article/mapper/ArticleMapper.xml +++ b/ruoyi-service/src/main/java/com/ruoyi/bst/article/mapper/ArticleMapper.xml @@ -47,10 +47,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" where id = #{id} - where id = #{categoryId} + - where id = #{id} + where bcs.id = #{id} @@ -219,6 +223,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" area_id = #{data.areaId}, + store_id = #{data.storeId}, name = #{data.name}, contact = #{data.contact}, start_time = #{data.startTime}, diff --git a/ruoyi-web/src/main/java/com/ruoyi/web/bst/ArticleCategoryController.java b/ruoyi-web/src/main/java/com/ruoyi/web/bst/ArticleCategoryController.java index 82162e5..fec149e 100644 --- a/ruoyi-web/src/main/java/com/ruoyi/web/bst/ArticleCategoryController.java +++ b/ruoyi-web/src/main/java/com/ruoyi/web/bst/ArticleCategoryController.java @@ -92,9 +92,9 @@ public class ArticleCategoryController extends BaseController */ @PreAuthorize("@ss.hasPermi('bst:articleCategory:remove')") @Log(title = "文章分类", businessType = BusinessType.DELETE) - @DeleteMapping("/{ids}") - public AjaxResult remove(@PathVariable Long[] ids) + @DeleteMapping("/{id}") + public AjaxResult remove(@PathVariable Long id) { - return toAjax(articleCategoryService.deleteArticleCategoryByIds(ids)); + return success(articleCategoryService.deleteArticleCategoryById(id)); } } diff --git a/ruoyi-web/src/main/java/com/ruoyi/web/bst/CustomerServiceController.java b/ruoyi-web/src/main/java/com/ruoyi/web/bst/CustomerServiceController.java index 42bf477..ac62cd7 100644 --- a/ruoyi-web/src/main/java/com/ruoyi/web/bst/CustomerServiceController.java +++ b/ruoyi-web/src/main/java/com/ruoyi/web/bst/CustomerServiceController.java @@ -53,6 +53,7 @@ public class CustomerServiceController extends BaseController { startPage(); startOrderBy(); + query.setScope(true); List list = customerServiceService.selectCustomerServiceList(query); return getDataTable(list); } @@ -111,6 +112,7 @@ public class CustomerServiceController extends BaseController if (!customerServiceValidator.canEdit(customerService.getId())) { return AjaxResult.error("您没有权限修改ID为" + customerService.getId() + "的客服信息"); } + customerService.setStoreId(areaService.selectAreaById(customerService.getAreaId()).getUserId()); return toAjax(customerServiceService.updateCustomerService(customerService)); }