Skip to content

G
gxpt_ht
Commit baacbf12 by 吕明尚
Options

Merge branch 'dev' into test

parents af4d5688 74f3d360
Showing with 2 additions and 2 deletions
share-system/src/main/java/share/system/service/impl/SConsumerServiceImpl.java
...@@ -288,7 +288,7 @@ public class SConsumerServiceImpl extends ServiceImpl<SConsumerMapper, SConsumer ...@@ -288,7 +288,7 @@ public class SConsumerServiceImpl extends ServiceImpl<SConsumerMapper, SConsumer
List<Long> idList = ListUtil.toList(ids); List<Long> idList = ListUtil.toList(ids);
List<SConsumer> list = baseMapper.selectBatchIds(idList); List<SConsumer> list = baseMapper.selectBatchIds(idList);
//解除所有门店关联 //解除所有门店关联
storeConsumerMapper.deleteBatchIds(idList); storeConsumerMapper.delete(new LambdaQueryWrapper<SStoreConsumer>().in(SStoreConsumer::getConsumerId, idList));
list.stream().forEach(sConsumer -> { list.stream().forEach(sConsumer -> {
sConsumer.setRoleType(RoleTypeEnum.MEMBRO.getCode()); sConsumer.setRoleType(RoleTypeEnum.MEMBRO.getCode());
}); });
......
share-system/src/main/resources/mapper/system/DeviceMapper.xml
...@@ -34,7 +34,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" ...@@ -34,7 +34,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
voltage, signal_value, room_id from s_device voltage, signal_value, room_id from s_device
</sql> </sql>
<select id="selectDeviceList" parameterType="Device" resultMap="DeviceResult"> <select id="selectDeviceList" parameterType="DeviceDto" resultMap="DeviceResult">
select select
t1.id, t1.id,
t1.dev_name, t1.dev_name,
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment