xuhy
2025-01-15 6e70319785ef4e5d1418e957c2c3bf2059a6eb5e
ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/controller/TechnicianController.java
@@ -76,6 +76,7 @@
        Page<Technician> page = technicianService.lambdaQuery().like(name != null, Technician::getName, name)
                .like(phone != null, Technician::getPhone, phone)
                .eq(Technician::getShopId, sysUser.getObjectId())
                .eq(Technician::getDelFlag, 0)
                .page(Page.of(pageNum, pageSize));
        return R.ok(page);
    }
@@ -91,7 +92,10 @@
        if (technician.getId()==null) {
            technician.setSubscribeStatus(2);
            List<Technician> list = technicianService.lambdaQuery().eq(Technician::getPhone, technician.getPhone()).eq(Technician::getShopId, sysUser.getObjectId()).list();
            List<Technician> list = technicianService.lambdaQuery()
                    .eq(Technician::getPhone, technician.getPhone())
                    .eq(Technician::getShopId, sysUser.getObjectId())
                    .eq(Technician::getDelFlag, 0).list();
            if (!list.isEmpty()) {
                return R.fail("当前号码已经添加");
            }
@@ -113,7 +117,9 @@
            if (byId.getPhone()!=technician.getPhone()){
                List<Technician> list = technicianService.lambdaQuery()
                        .eq(Technician::getPhone, technician.getPhone())
                        .ne(Technician::getId, byId.getId()).list();
                        .eq(Technician::getShopId, sysUser.getObjectId())
                        .ne(Technician::getId, byId.getId())
                        .eq(Technician::getDelFlag, 0).list();
                if (!list.isEmpty()) {
                    return R.fail("当前号码已经添加");
                }