From 4fd3a2736011c69c8729f2b28902a5cd9d09fd2b Mon Sep 17 00:00:00 2001
From: whycq <10027870+whycq@user.noreply.gitee.com>
Date: 星期五, 21 七月 2023 09:19:40 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master' into master
---
src/main/java/com/zy/crm/manager/service/impl/CstmrServiceImpl.java | 25 ++++++++++++++++++++++---
1 files changed, 22 insertions(+), 3 deletions(-)
diff --git a/src/main/java/com/zy/crm/manager/service/impl/CstmrServiceImpl.java b/src/main/java/com/zy/crm/manager/service/impl/CstmrServiceImpl.java
index 4c71cb2..2655f82 100644
--- a/src/main/java/com/zy/crm/manager/service/impl/CstmrServiceImpl.java
+++ b/src/main/java/com/zy/crm/manager/service/impl/CstmrServiceImpl.java
@@ -1,6 +1,7 @@
package com.zy.crm.manager.service.impl;
import com.baomidou.mybatisplus.plugins.Page;
+import com.core.common.Cools;
import com.zy.crm.manager.mapper.CstmrMapper;
import com.zy.crm.manager.entity.Cstmr;
import com.zy.crm.manager.service.CstmrService;
@@ -16,7 +17,21 @@
}
@Override
- public String getNextUuid(Long hostId) {
+ public synchronized String getUuid(Long hostId) {
+ String uuid = null;
+ int times = 0;
+ while (Cools.isEmpty(uuid)) {
+ if (times > 100) { break; }
+ String nextUuid = getNextUuid(hostId);
+ if (selectByUuid(hostId, nextUuid) == null) {
+ uuid = nextUuid;
+ }
+ times ++;
+ }
+ return uuid;
+ }
+
+ private String getNextUuid(Long hostId) {
Cstmr cstmr = this.baseMapper.selectCstmrByNewestUuid(hostId);
if (cstmr == null) {
return "0001";
@@ -25,10 +40,14 @@
}
@Override
- public Page<Cstmr> getPage(Page page, Long hostId, String deptId, String condition) {
- return page.setRecords(baseMapper.listByPage(page, hostId, deptId, condition));
+ public Page<Cstmr> getPage(Page<Cstmr> page, Long hostId, String deptId, Long userId, String condition) {
+ return page.setRecords(baseMapper.listByPage(page, hostId, deptId, userId, condition));
}
+ @Override
+ public int updateDeptIdByUserId(Long userId, Long deptId) {
+ return this.baseMapper.updateDeptIdByUserId(userId, deptId);
+ }
public static String zerofill(String msg, Integer count){
if (msg.length() == count){
--
Gitblit v1.9.1