From 82f101eac4d21d1edb80c247d75848563d43f54f Mon Sep 17 00:00:00 2001
From: yishiqihuasheng <1191093413@qq.com>
Date: Tue, 22 Aug 2023 09:03:02 +0800
Subject: [PATCH] =?UTF-8?q?=E8=A7=A3=E5=86=B3=E7=BB=BC=E5=90=88=E6=9F=A5?=
 =?UTF-8?q?=E8=AF=A2=E6=B2=A1=E6=95=B0=E6=8D=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../mailGather/EmailMaintainController.java   | 21 ++++++------
 .../controller/ExtFpzhcxController.java       | 32 ++++---------------
 2 files changed, 18 insertions(+), 35 deletions(-)

diff --git a/dxhy-core/src/main/java/com/dxhy/core/controller/mailGather/EmailMaintainController.java b/dxhy-core/src/main/java/com/dxhy/core/controller/mailGather/EmailMaintainController.java
index 084cec95..5be951a3 100644
--- a/dxhy-core/src/main/java/com/dxhy/core/controller/mailGather/EmailMaintainController.java
+++ b/dxhy-core/src/main/java/com/dxhy/core/controller/mailGather/EmailMaintainController.java
@@ -97,10 +97,11 @@ public class EmailMaintainController extends AbstractController  {
         emailMaintain.setCreateUser(loginname);
 
         DynamicContextHolder.push(DbConstant.BASICS_READ);
-        EmailMaintainVo vo = new EmailMaintainVo();
-        vo.setEmailAddress(emailMaintain.getEmailAddress());
-        EmailMaintainVo maintainVo = emailMaintainService.getEmailMaintainVo(vo);
-        if(maintainVo != null){
+//        EmailMaintainVo vo = new EmailMaintainVo();
+//        vo.setEmailAddress(emailMaintain.getEmailAddress());
+//        EmailMaintainVo maintainVo = emailMaintainService.getEmailMaintainVo(vo);
+        int count = emailMaintainService.selectByEmail(emailMaintain.getEmailAddress());
+        if(count>0){
             return ResponseEntity.ok(R.error("邮箱地址已存在！"));
         }
         boolean insert = this.emailMaintainService.insert(emailMaintain);
@@ -125,12 +126,12 @@ public class EmailMaintainController extends AbstractController  {
             emailMaintain.setEmailPassword(encode);
         }
         DynamicContextHolder.push(DbConstant.BASICS_READ);
-        EmailMaintainVo vo = new EmailMaintainVo();
-        vo.setEmailAddress(emailMaintain.getEmailAddress());
-        EmailMaintainVo maintainVo = emailMaintainService.getEmailMaintainVo(vo);
-        if(maintainVo != null && maintainVo.getId().equals(emailMaintain.getId())){
-            return ResponseEntity.ok(R.error("邮箱地址已存在！"));
-        }
+//        EmailMaintainVo vo = new EmailMaintainVo();
+//        vo.setEmailAddress(emailMaintain.getEmailAddress());
+//        EmailMaintainVo maintainVo = emailMaintainService.getEmailMaintainVo(vo);
+//        if(maintainVo != null && maintainVo.getId().equals(emailMaintain.getId())){
+//            return ResponseEntity.ok(R.error("邮箱地址已存在！"));
+//        }
 
         String userId = emailMaintain.getUserId();
 
diff --git a/dxhy-extend/src/main/java/com/dxhy/extend/controller/ExtFpzhcxController.java b/dxhy-extend/src/main/java/com/dxhy/extend/controller/ExtFpzhcxController.java
index 806bd1ef..fbf235d9 100644
--- a/dxhy-extend/src/main/java/com/dxhy/extend/controller/ExtFpzhcxController.java
+++ b/dxhy-extend/src/main/java/com/dxhy/extend/controller/ExtFpzhcxController.java
@@ -105,35 +105,17 @@ public class ExtFpzhcxController extends AbstractController {
         pramsMap.put("business", getUserInfo().getBusiness());
         pramsMap.put("dbName", getUserInfo().getDbName());
 
-        List<String> gfshList = new ArrayList<>();
-        if (!"99".equals(pramsMap.get("gfsh")) && pramsMap.get("gfsh") != null && !"".equals(pramsMap.get("gfsh"))) {
-            gfshList.add(pramsMap.get("gfsh").toString());
-        } else {
-            gfshList = UserInfoUtil.getGfshAll(getUserInfo().getOrg());
-            if (gfshList.size() == 0) {
-                return ResponseEntity.ok(R.ok().put("data", ""));
-            }
+        if(pramsMap.get("gfsh") == null || "".equals(pramsMap.get("gfsh"))){
+            return ResponseEntity.ok(R.error("购方税号不能为空"));
         }
-        pramsMap.put("gfsh", gfshList);
-
-        boolean flag = checkList(gfshList);
+        String gfsh = (String) pramsMap.get("gfsh");
+        pramsMap.put("gfsh", gfsh);
 
-        if (flag){
-            pramsMap.put("sign","88");
-        }else {
-            pramsMap.put("sign","99");
+        if (pramsMap.get("companyCode") == null || "".equals(pramsMap.get("companyCode"))){
+            return ResponseEntity.ok(R.error("组织编码不能为空"));
         }
-
         String companyCode = (String) pramsMap.get("companyCode");
-        if (org.apache.commons.lang3.StringUtils.isNotBlank(companyCode) && "99".equals(companyCode)){
-            pramsMap.put("companyCodes",getUserInfo().getCompanyCodes());
-            log.info("组织机构====>{}",pramsMap.get("companyCodes"));
-        }
-        if (StringUtils.isNotBlank(companyCode)){
-            pramsMap.put("companyCode",companyCode);
-        }else {
-            return ResponseEntity.ok(R.error("所属组织不能为空"));
-        }
+        pramsMap.put("companyCode",companyCode);
 
         if (pramsMap.get("kpksrq") != null && !"".equals(pramsMap.get("kpksrq"))) {
             pramsMap.put("kpksrq", DateUtils.getMorning(DateUtils.strToDate(pramsMap.get("kpksrq").toString())));