whyclxw
2025-04-25 92d5abeefe20770dbc37bdf68097dd3bfcd1673f
删除锁时不删除标记为1
3个文件已修改
7 ■■■■■ 已修改文件
src/main/java/com/whyc/service/HomeService.java 2 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/com/whyc/service/LockInfService.java 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/resources/mapper/LockAddressMapper.xml 1 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/main/java/com/whyc/service/HomeService.java
@@ -39,6 +39,7 @@
            List<Integer> lockidList = bjLockMapper.getLockIdByUid(uid);
            QueryWrapper wrapper = new QueryWrapper();
            wrapper.in("lock_id", lockidList);
            wrapper.eq("del_flag", 0);
            wrapper.orderByAsc("num");
            List<LockInf> list = linfMapper.selectList(wrapper);
            Map<String, Object> map = new HashMap<>();
@@ -86,6 +87,7 @@
            QueryWrapper wrapper = new QueryWrapper();
            wrapper.in("lock_id", lockidList);
            wrapper.eq("screen_flag",1);//只取屏柜
            wrapper.eq("del_flag", 0);
            wrapper.orderByAsc("num");
            List<LockInf> list=linfMapper.selectList(wrapper);
            Map<String, List<LockInf>>  boxType = list.stream().collect(Collectors.groupingBy(LockInf::getScreenBoxType));
src/main/java/com/whyc/service/LockInfService.java
@@ -215,6 +215,10 @@
            UpdateWrapper wrapper1=new UpdateWrapper();
            wrapper1.eq("lock_id",lockId);
            bjLockMapper.delete(wrapper1);
            //移除address
            UpdateWrapper wrapper2=new UpdateWrapper();
            wrapper2.eq("lock_id",lockId);
            addressMapper.delete(wrapper2);
        }
        return new Response().set(1,true);
    }
src/main/resources/mapper/LockAddressMapper.xml
@@ -7,6 +7,7 @@
        from plus_inf.tb_lock_address,plus_inf.tb_lock_inf
        <where>
            tb_lock_address.lock_id=tb_lock_inf.lock_id
            and tb_lock_inf.del_flag=0
            <if test="lockIdList!=null">
                and tb_lock_address.lock_id in
                <foreach collection="lockIdList" item="id" open="(" separator="," close=")">