From df781c84434cf2e91b389a4e36c8032b8334c721 Mon Sep 17 00:00:00 2001
From: wangwei <1610949092@qq.com>
Date: Fri, 2 Jun 2023 15:02:42 +0800
Subject: [PATCH] =?UTF-8?q?bug=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../controller/purchase/userPersonController.java  | 14 +++++++++-----
 .../api/controller/sup/UserComanyController.java   |  3 +--
 .../glxp/api/req/auth/UserPersonFilterRequest.java |  5 ++++-
 .../mybatis/mapper/sup/UserRegisterMapper.xml      |  6 ++++--
 4 files changed, 18 insertions(+), 10 deletions(-)

diff --git a/src/main/java/com/glxp/api/controller/purchase/userPersonController.java b/src/main/java/com/glxp/api/controller/purchase/userPersonController.java
index 4099cac..76bcf86 100644
--- a/src/main/java/com/glxp/api/controller/purchase/userPersonController.java
+++ b/src/main/java/com/glxp/api/controller/purchase/userPersonController.java
@@ -1,6 +1,7 @@
 package com.glxp.api.controller.purchase;
 
 import cn.hutool.core.util.IdUtil;
+import cn.hutool.core.util.StrUtil;
 import cn.hutool.crypto.SmUtil;
 import cn.hutool.crypto.asymmetric.KeyType;
 import cn.hutool.crypto.asymmetric.SM2;
@@ -48,15 +49,17 @@ public class userPersonController {
 
 
 
-    @GetMapping("/sup/company/person/filterList")
-    public BaseResponse filterCompanyCert(UserPersonFilterRequest userPersonFilterRequest , BindingResult bindingResult){
+    @PostMapping("/sup/company/person/filterList")
+    public BaseResponse filterCompanyCert(@RequestBody UserPersonFilterRequest userPersonFilterRequest , BindingResult bindingResult){
         if (bindingResult.hasErrors()) {
             return ResultVOUtils.error(ResultEnum.PARAM_VERIFY_FALL, bindingResult.getFieldError().getDefaultMessage());
         }
-        if(userPersonFilterRequest.getName() == null){
-            userPersonFilterRequest.setName("");
+        QueryWrapper<UserPersonEntity> and;
+        if(StrUtil.isNotBlank(userPersonFilterRequest.getUserName())){
+            and= new QueryWrapper<UserPersonEntity>().like("userName", userPersonFilterRequest.getUserName()).and(i -> i.eq("companyId", userPersonFilterRequest.getCompanyId()));
+        }else{
+            and= new QueryWrapper<UserPersonEntity>().eq("companyId", userPersonFilterRequest.getCompanyId());
         }
-        QueryWrapper<UserPersonEntity> and = new QueryWrapper<UserPersonEntity>().like("name", userPersonFilterRequest.getName()).and(i -> i.eq("companyId", userPersonFilterRequest.getCompanyId()));
         List<UserPersonEntity> list = userPersonService.list(and);
         PageInfo<UserPersonEntity> pageInfo;
         pageInfo = new PageInfo<>(list);
@@ -75,6 +78,7 @@ public class userPersonController {
 
         UserPersonEntity userPerson = new UserPersonEntity();
         BeanUtils.copyProperties(userPersonFilterRequest,userPerson);
+        userPerson.setPassword(userPersonFilterRequest.getCheckPassword());
         userPersonService.update(userPerson);
 
         return  ResultVOUtils.success();
diff --git a/src/main/java/com/glxp/api/controller/sup/UserComanyController.java b/src/main/java/com/glxp/api/controller/sup/UserComanyController.java
index 3410c87..e006aff 100644
--- a/src/main/java/com/glxp/api/controller/sup/UserComanyController.java
+++ b/src/main/java/com/glxp/api/controller/sup/UserComanyController.java
@@ -41,8 +41,7 @@ public class UserComanyController extends BaseController {
         if(filterUserComapanyRequest.getSearchKey() == null){
             filterUserComapanyRequest.setSearchKey("");
         }
-        List<UserCompanyEntity> userCompanyEntities = userCompanyService.list(new QueryWrapper<UserCompanyEntity>().like("companyName", filterUserComapanyRequest.getSearchKey())
-                .or().like("creditNum", filterUserComapanyRequest.getSearchKey()));
+        List<UserCompanyEntity> userCompanyEntities = userCompanyService.list(new QueryWrapper<UserCompanyEntity>().like("companyName", filterUserComapanyRequest.getSearchKey()).eq("checkStatus",1));
 
         PageInfo<UserCompanyEntity> pageInfo;
         pageInfo = new PageInfo<>(userCompanyEntities);
diff --git a/src/main/java/com/glxp/api/req/auth/UserPersonFilterRequest.java b/src/main/java/com/glxp/api/req/auth/UserPersonFilterRequest.java
index f75583f..2c6cc5b 100644
--- a/src/main/java/com/glxp/api/req/auth/UserPersonFilterRequest.java
+++ b/src/main/java/com/glxp/api/req/auth/UserPersonFilterRequest.java
@@ -11,12 +11,15 @@ public class UserPersonFilterRequest extends ListPageRequest {
     private String registerId;
     private String companyId;
     private String userName;
-    private String passsword;
+    private String password;
     private String name;
     private String tel;
     private String qq;
     private String weChat;
     private String companyName;
+    private String email;
+    private String checkPassword;
+
 
 
 }
diff --git a/src/main/resources/mybatis/mapper/sup/UserRegisterMapper.xml b/src/main/resources/mybatis/mapper/sup/UserRegisterMapper.xml
index 6d414ba..d967b8e 100644
--- a/src/main/resources/mybatis/mapper/sup/UserRegisterMapper.xml
+++ b/src/main/resources/mybatis/mapper/sup/UserRegisterMapper.xml
@@ -60,8 +60,10 @@
                user_company.id as ucId
 
         from
-            user_register LEFT JOIN user_company on user_register.companyId=user_company.id
-                          LEFT JOIN user_person on user_register.companyId=user_person.companyId
+        user_company
+
+        LEFT JOIN user_register ON user_register.companyId = user_company.id
+        LEFT JOIN user_person ON user_company.id = user_person.companyId
 
         <where>
             and user_register.checkStatus != 0