From b979ccbc9746d220c1ddfb01b01eab4d2fbdaddf Mon Sep 17 00:00:00 2001 From: sxu <602087911@qq.com> Date: Thu, 3 Jul 2025 08:57:55 +0800 Subject: [PATCH] =?UTF-8?q?Revert=20"bug-6628-=E6=8E=A5=E5=8F=A3=E8=BF=94?= =?UTF-8?q?=E5=9B=9E=E6=89=8B=E6=9C=BA=E5=8F=B7=E5=8A=A0=E5=AF=86"?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This reverts commit 9d43f1f833ef9f8bb1f0613c3ecde46f5a19da0c. --- .../core/basic/service/impl/BasicAreaServiceImpl.java | 5 +---- .../core/basic/service/impl/BasicCanteenServiceImpl.java | 5 +---- .../core/basic/service/impl/BasicStallServiceImpl.java | 5 +---- 3 files changed, 3 insertions(+), 12 deletions(-) diff --git a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/basic/service/impl/BasicAreaServiceImpl.java b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/basic/service/impl/BasicAreaServiceImpl.java index 78b9000..a82485c 100644 --- a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/basic/service/impl/BasicAreaServiceImpl.java +++ b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/basic/service/impl/BasicAreaServiceImpl.java @@ -12,7 +12,6 @@ import com.bonus.canteen.core.supermarket.mapper.SupermarketInfoMapper; import com.bonus.common.core.exception.ServiceException; import com.bonus.common.core.utils.DateUtils; import com.bonus.common.core.utils.StringUtils; -import com.bonus.common.core.utils.encryption.Sm4Utils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import com.bonus.canteen.core.basic.mapper.BasicAreaMapper; @@ -55,9 +54,7 @@ public class BasicAreaServiceImpl implements IBasicAreaService { */ @Override public List selectBasicAreaList(BasicArea basicArea) { - List list = basicAreaMapper.selectBasicAreaList(basicArea); - list.stream().forEach(item -> item.setContactTel(Sm4Utils.encrypt(item.getContactTel()))); - return list; + return basicAreaMapper.selectBasicAreaList(basicArea); } @Override diff --git a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/basic/service/impl/BasicCanteenServiceImpl.java b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/basic/service/impl/BasicCanteenServiceImpl.java index 41616fa..f0b23b8 100644 --- a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/basic/service/impl/BasicCanteenServiceImpl.java +++ b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/basic/service/impl/BasicCanteenServiceImpl.java @@ -8,7 +8,6 @@ import com.bonus.canteen.core.basic.mapper.BasicStallMapper; import com.bonus.canteen.core.utils.BnsConstants; import com.bonus.common.core.exception.ServiceException; import com.bonus.common.core.utils.DateUtils; -import com.bonus.common.core.utils.encryption.Sm4Utils; import com.bonus.common.security.utils.SecurityUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; @@ -48,9 +47,7 @@ public class BasicCanteenServiceImpl implements IBasicCanteenService { */ @Override public List selectBasicCanteenList(BasicCanteen basicCanteen) { - List list = basicCanteenMapper.selectBasicCanteenList(basicCanteen); - list.stream().forEach(item -> item.setContactTel(Sm4Utils.encrypt(item.getContactTel()))); - return list; + return basicCanteenMapper.selectBasicCanteenList(basicCanteen); } /** diff --git a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/basic/service/impl/BasicStallServiceImpl.java b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/basic/service/impl/BasicStallServiceImpl.java index 1149d3d..0b7c84b 100644 --- a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/basic/service/impl/BasicStallServiceImpl.java +++ b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/basic/service/impl/BasicStallServiceImpl.java @@ -13,7 +13,6 @@ import com.bonus.canteen.core.device.mapper.DeviceBindMapper; import com.bonus.canteen.core.utils.BnsConstants; import com.bonus.common.core.exception.ServiceException; import com.bonus.common.core.utils.DateUtils; -import com.bonus.common.core.utils.encryption.Sm4Utils; import com.bonus.common.security.utils.SecurityUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; @@ -63,9 +62,7 @@ public class BasicStallServiceImpl implements IBasicStallService { */ @Override public List selectBasicStallList(BasicStall basicStall) { - List list = basicStallMapper.selectBasicStallList(basicStall); - list.stream().forEach(item -> item.setContactTel(Sm4Utils.encrypt(item.getContactTel()))); - return list; + return basicStallMapper.selectBasicStallList(basicStall); } /**