解决综合查询没数据

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();
+//        EmailMaintainVo vo = new EmailMaintainVo();
-        vo.setEmailAddress(emailMaintain.getEmailAddress());
+//        vo.setEmailAddress(emailMaintain.getEmailAddress());
-        EmailMaintainVo maintainVo = emailMaintainService.getEmailMaintainVo(vo);
+//        EmailMaintainVo maintainVo = emailMaintainService.getEmailMaintainVo(vo);
-        if(maintainVo != null){
+        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();
+//        EmailMaintainVo vo = new EmailMaintainVo();
-        vo.setEmailAddress(emailMaintain.getEmailAddress());
+//        vo.setEmailAddress(emailMaintain.getEmailAddress());
-        EmailMaintainVo maintainVo = emailMaintainService.getEmailMaintainVo(vo);
+//        EmailMaintainVo maintainVo = emailMaintainService.getEmailMaintainVo(vo);
-        if(maintainVo != null && maintainVo.getId().equals(emailMaintain.getId())){
+//        if(maintainVo != null && maintainVo.getId().equals(emailMaintain.getId())){
-            return ResponseEntity.ok(R.error("邮箱地址已存在！"));
+//            return ResponseEntity.ok(R.error("邮箱地址已存在！"));
-        }
+//        }
 
         String userId = emailMaintain.getUserId();
 

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(pramsMap.get("gfsh") == null || "".equals(pramsMap.get("gfsh"))){
-        if (!"99".equals(pramsMap.get("gfsh")) && pramsMap.get("gfsh") != null && !"".equals(pramsMap.get("gfsh"))) {
+            return ResponseEntity.ok(R.error("购方税号不能为空"));
-            gfshList.add(pramsMap.get("gfsh").toString());
-        } else {
-            gfshList = UserInfoUtil.getGfshAll(getUserInfo().getOrg());
-            if (gfshList.size() == 0) {
-                return ResponseEntity.ok(R.ok().put("data", ""));
-            }
         }
-        pramsMap.put("gfsh", gfshList);
+        String gfsh = (String) pramsMap.get("gfsh");
-
+        pramsMap.put("gfsh", gfsh);
-        boolean flag = checkList(gfshList);
 
-        if (flag){
+        if (pramsMap.get("companyCode") == null || "".equals(pramsMap.get("companyCode"))){
-            pramsMap.put("sign","88");
+            return ResponseEntity.ok(R.error("组织编码不能为空"));
-        }else {
-            pramsMap.put("sign","99");
         }
-
         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("所属组织不能为空"));
-        }
 
         if (pramsMap.get("kpksrq") != null && !"".equals(pramsMap.get("kpksrq"))) {
             pramsMap.put("kpksrq", DateUtils.getMorning(DateUtils.strToDate(pramsMap.get("kpksrq").toString())));