From 9c1840e4302d8c4f7af549e5de412488073490bf Mon Sep 17 00:00:00 2001
From: zhangzeli <123456>
Date: 星期二, 11 一月 2022 11:23:05 +0800
Subject: [PATCH] bug
---
xboot-modules/xboot-your/src/main/java/cn/exrick/xboot/your/controller/FingerprintController.java | 23 +++++++++++++++--------
1 files changed, 15 insertions(+), 8 deletions(-)
diff --git a/xboot-modules/xboot-your/src/main/java/cn/exrick/xboot/your/controller/FingerprintController.java b/xboot-modules/xboot-your/src/main/java/cn/exrick/xboot/your/controller/FingerprintController.java
index a84a445..0bbfb16 100644
--- a/xboot-modules/xboot-your/src/main/java/cn/exrick/xboot/your/controller/FingerprintController.java
+++ b/xboot-modules/xboot-your/src/main/java/cn/exrick/xboot/your/controller/FingerprintController.java
@@ -1,14 +1,10 @@
package cn.exrick.xboot.your.controller;
-import cn.exrick.xboot.core.common.constant.SettingConstant;
-import cn.exrick.xboot.core.common.utils.CommonUtil;
import cn.exrick.xboot.core.common.utils.PageUtil;
import cn.exrick.xboot.core.common.utils.ResultUtil;
import cn.exrick.xboot.core.common.vo.PageVo;
import cn.exrick.xboot.core.common.vo.Result;
-import cn.exrick.xboot.core.entity.Setting;
import cn.exrick.xboot.core.entity.User;
-import cn.exrick.xboot.core.service.SettingService;
import cn.exrick.xboot.core.service.UserService;
import cn.exrick.xboot.your.entity.Customer;
import cn.exrick.xboot.your.entity.CustomerReceive;
@@ -25,10 +21,6 @@
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
import org.springframework.transaction.annotation.Transactional;
-import org.springframework.web.multipart.MultipartFile;
-
-import javax.servlet.http.HttpServletRequest;
-import java.io.InputStream;
import java.util.List;
/**
@@ -113,7 +105,11 @@
QueryWrapper<Fingerprint> wrapper = new QueryWrapper<>();
wrapper.eq("code",code);
wrapper.eq("area_id",c.getAreaId());
+ wrapper.eq("customer_id",customerId);
Fingerprint one = iFingerprintService.getOne(wrapper);
+ if(one==null){
+ return ResultUtil.error("鎸囩汗涓庡晢鎴蜂笉鍖归厤");
+ }
CustomerReceive customerReceive = iCustomerReceiveService.getById(one.getCustomerReceiveId());
return new ResultUtil<Object>().setData(customerReceive);
@@ -141,6 +137,17 @@
User user = userService.get(fingerprint.getUserId());
fingerprint.setUsername(user.getUsername());
fingerprint.setPassword(user.getDescription());
+ fingerprint.setType(user.getType2());
+ }
+ if(StrUtil.isNotEmpty(fingerprint.getCustomerId())){
+ Customer byId = iCustomerService.getById(fingerprint.getCustomerId());
+ fingerprint.setAreaId(byId.getAreaId());
+ }
+
+ if(StrUtil.isNotEmpty(fingerprint.getCustomerReceiveId())){
+ CustomerReceive byId = iCustomerReceiveService.getById(fingerprint.getCustomerReceiveId());
+ byId.setFstatus(1);
+ iCustomerReceiveService.saveOrUpdate(byId);
}
if (iFingerprintService.saveOrUpdate(fingerprint)) {
return new ResultUtil<Fingerprint>().setData(fingerprint);
--
Gitblit v1.9.1