更新一些修改

app/common/api/EnterpriseApi.php

@@ -201,6 +201,7 @@ class EnterpriseApi {
 
                 }
 
+
                 $_whr[] = ["uniCode", "<>", ""];
                 $_whr[] = ["delete", "=", 0];
                 $_whr[] = ["companyId", "<>", $companyId];
@@ -210,25 +211,19 @@ class EnterpriseApi {
                     $codes = explode(",", $_v["uniCode"]);
                     $expUniCodes = array_merge($expUniCodes, (array) $codes);
                 }
+
                 if (($talentType || $org || $ins) && $uniCodes) {
                     if ($expUniCodes) {
-                        $whereRaw = sprintf('(newEnterpriseTag in ("%s") and newOrganizationTag in ("%s") and newInstitutionTag in ("%s") and newIdCard not in ("%s")) or newIdCard in ("%s")', implode('","', $talentType), implode('","', $org), implode('","', $ins), implode('","', $expUniCodes), implode('","', $uniCodes));
+                        $whereRaw = sprintf('(newEnterpriseTag in ("%s") or newOrganizationTag in ("%s") or newInstitutionTag in ("%s") and newIdCard not in ("%s")) or newIdCard in ("%s")', implode('","', $talentType), implode('","', $org), implode('","', $ins), implode('","', $expUniCodes), implode('","', $uniCodes));
                     } else {
-                        $whereRaw = sprintf('newEnterpriseTag in ("%s") and newOrganizationTag in ("%s") and newInstitutionTag in ("%s") or newIdCard in ("%s")', implode('","', $talentType), implode('","', $org), implode('","', $ins), implode('","', $uniCodes));
+                        $whereRaw = sprintf('newEnterpriseTag in ("%s") or newOrganizationTag in ("%s") or newInstitutionTag in ("%s") or newIdCard in ("%s")', implode('","', $talentType), implode('","', $org), implode('","', $ins), implode('","', $uniCodes));
                     }
                 }
                 if (($talentType || $org || $ins) && !$uniCodes) {
-                    if($talentType){
-                        $where[] = ["newEnterpriseTag", "in", $talentType];
-                    }
-                    if($org){
-                        $where[] = ["newOrganizationTag", "in", $org];
-                    }
-                    if($ins){
-                        $where[] = ["newInstitutionTag", "in", $ins];
-                    }
                     if ($expUniCodes) {
-                        $where[] = ["newIdCard", "not in", $expUniCodes];
+                        $whereRaw = sprintf('newEnterpriseTag in ("%s") or newOrganizationTag in ("%s") or newInstitutionTag in ("%s") and newIdCard not in ("%s")', implode('","', $talentType), implode('","', $org), implode('","', $ins), implode('","', $expUniCodes));
+                    } else {
+                        $whereRaw = sprintf('newEnterpriseTag in ("%s") or newOrganizationTag in ("%s") or newInstitutionTag in ("%s") ', implode('","', $talentType), implode('","', $org), implode('","', $ins));
                     }
                 }
             }