liao-sea преди 1 година
родител
ревизия
494e2a3e5b

+ 5 - 1
src/main/java/com/hz/employmentsite/services/impl/baseSettings/InstitutionImpl.java

@@ -51,7 +51,11 @@ public class InstitutionImpl implements InstitutionService {
     @Override
     public InstitutionVo get(String institutionID) {
         List<String> ids = new ArrayList<>();
-        ids.add(institutionID);
+        if (stringUtils.IsNullOrEmpty(institutionID)) {
+            return null;
+        }else{
+            ids.add(institutionID);
+        }
         InstitutionVo model = institutionCQuery.getList(stringUtils.ListToInSql(ids),null,null ,null).stream().findFirst().orElse(null);
         return model;
     }

+ 5 - 1
src/main/java/com/hz/employmentsite/services/impl/baseSettings/SiteInfoImpl.java

@@ -74,7 +74,11 @@ public class SiteInfoImpl implements SiteInfoService {
     @Override
     public SiteInfoVo get(String siteID) {
         List<String> ids = new ArrayList<>();
-        ids.add(siteID);
+        if (stringUtils.IsNullOrEmpty(siteID)) {
+            return null;
+        }else{
+            ids.add(siteID);
+        }
         SiteInfoVo model = siteInfoCQuery.getList(stringUtils.ListToInSql(ids),null,null ,null,null,null).stream().findFirst().orElse(null);
         return model;
     }

+ 6 - 3
src/main/java/com/hz/employmentsite/services/impl/baseSettings/SiteUserImpl.java

@@ -67,9 +67,12 @@ public class SiteUserImpl implements SiteUserService {
     @Override
     public SiteUserVo get(String siteUserID) {
         List<String> ids = new ArrayList<>();
-        ids.add(siteUserID);
-        String sqlPrimaryKey = stringUtils.ListToInSql(ids);
-        SiteUserVo model = userInfoCQuery.getList(sqlPrimaryKey,null,null).stream().findFirst().orElse(null);
+        if (stringUtils.IsNullOrEmpty(siteUserID)) {
+            return null;
+        }else{
+            ids.add(siteUserID);
+        }
+        SiteUserVo model = userInfoCQuery.getList(stringUtils.ListToInSql(ids),null,null).stream().findFirst().orElse(null);
         return model;
     }
 

+ 5 - 1
src/main/java/com/hz/employmentsite/services/impl/jobUserManager/JobHuntServiceImpl.java

@@ -53,7 +53,11 @@ public class JobHuntServiceImpl implements JobHuntService {
     @Override
     public JobHuntVo get(String jobHuntId) {
         List<String> ids = new ArrayList<>();
-        ids.add(jobHuntId);
+        if (stringUtils.IsNullOrEmpty(jobHuntId)) {
+            return null;
+        }else{
+            ids.add(jobHuntId);
+        }
         JobHuntVo model = jobhuntCQuery.getJobHuntList(stringUtils.ListToInSql(ids),null,null,null,null,null,
                 null,null,null,null,null).stream().findFirst().orElse(null);
         return model;

+ 4 - 1
src/main/java/com/hz/employmentsite/services/impl/jobUserManager/JobUserServiceImpl.java

@@ -66,10 +66,13 @@ public class JobUserServiceImpl implements JobUserService {
 
     @Override
     public JobUserVo getDataById(String id) {
+        List<String> ids = new ArrayList<>();
         if (stringUtils.IsNullOrEmpty(id)) {
             return null;
+        }else{
+            ids.add(id);
         }
-        return jobUserCQuery.selectJobUserList(id, null, null, null, null, null, null).stream().findFirst().orElse(null);
+        return jobUserCQuery.selectJobUserList(stringUtils.ListToInSql(ids), null, null, null, null, null, null).stream().findFirst().orElse(null);
     }
 
     @Override

+ 4 - 2
src/main/java/com/hz/employmentsite/services/impl/taskAndLog/DoWorkImpl.java

@@ -38,10 +38,12 @@ public class DoWorkImpl implements DoWorkService {
 
     @Override
     public DoWorkVo get(String doWorkID) {
+        if (stringUtils.IsNullOrEmpty(doWorkID)) {
+            return null;
+        }
         List<String> ids = new ArrayList<>();
         ids.add(doWorkID);
-        String sqlPrimaryKey = stringUtils.ListToInSql(ids);
-        DoWorkVo model = doWorkCQuery.getList(sqlPrimaryKey,null,null,null,null,null,null).stream().findFirst().orElse(null);
+        DoWorkVo model = doWorkCQuery.getList(stringUtils.ListToInSql(ids),null,null,null,null,null,null).stream().findFirst().orElse(null);
         return model;
     }
 

+ 1 - 1
vue/src/views/baseSettings/institution/index.vue

@@ -94,7 +94,7 @@ export default defineComponent({
       {title: '负责人电话', dataIndex: 'fzrMobile', key: 'fzrMobile', width:110,align: "center"},
       {title: '法人姓名', dataIndex: 'frName', key: 'frName',width:100, align: "center"},
       {title: '法人电话', dataIndex: 'frMobile', key: 'frMobile',width:110, align: "center"},
-      {title: '企业机构代码', dataIndex: 'companyCode', key: 'companyCode', align: "center"},
+      {title: '企业机构代码', dataIndex: 'companyCode', key: 'companyCode',width:180, align: "center"},
       {title: '管理驿站数量', dataIndex: 'siteCount', key: 'siteCount', width:100,align: "center",
         /*customRender:  ({record}) => record.resolveDate == null?"":dayjs(record.resolveDate).format('YYYY-MM-DD')*/
       },