Merge remote-tracking branch 'origin/master'

jwtech-pc-page/src/api/enterpriseInformation.js

@@ -43,6 +43,14 @@ export function listByEid(enterpriseId) {
 
 // 企业详情-人员信息
 export function personInfoList(data) {
+  return request({
+    url: '/enterprise/personInfo/list',
+    method: 'POST',
+    data: data
+  })
+}
+
+export function personInfoList22(data) {
   return request({
     url: '/enterprise/certificateInfo/list',
     method: 'POST',

jwtech-pc-page/src/views/enterpriseInformation/components/personalTable.vue

@@ -121,10 +121,16 @@ export default {
       return res;
     },
     getPersonInfo() {
+      console.log(11111);
       this.queryParams.data.enterpriseId = this.$route.query.enterpriseId;
       personInfoList(this.queryParams).then(res => {
-        res.data.records.forEach(item => {
+        console.log(22222);
+        console.log(res);
+
+        res.data.data.records.forEach(item => {
+          console.log(item.personType +"-->res.data.records")
           this.allPersonType.forEach(item2 => {
+            console.log(item.personType +"-->"+item2.personTypeValue)
             if (item.personType == item2.personTypeValue) {
               item2.personTypeData.push(item);
             }

jwtech-system/src/main/java/com/kms/enterprise/controller/BsSgcYxjdPersonnelInfoController.java

@@ -81,6 +81,11 @@ public class BsSgcYxjdPersonnelInfoController extends BaseController
             lambdaQueryWrapper.eq(BsSgcYxjdPersonnelInfo::getPersonType,personType);
         }
 
+        String enterpriseId = personnelInfoSearchParam.getData().getEnterpriseId();
+        if (StringUtils.isNotBlank(enterpriseId)){
+            lambdaQueryWrapper.eq(BsSgcYxjdPersonnelInfo::getEnterpriseId,enterpriseId);
+        }
+
         String enterpriseName = personnelInfoSearchParam.getData().getEnterpriseName();
         if (org.apache.commons.lang3.StringUtils.isNotBlank(enterpriseName)) {
             lambdaQueryWrapper.apply("exists (select 1 from bs_sgc_yxjd_enterprise_info where id = bs_sgc_yxjd_personnel_info.enterprise_id and enterprise_name like concat('%', {0}, '%'))", enterpriseName);