web-求职人员导入功能调整

src/main/java/com/hz/employmentsite/services/impl/jobUserManager/JobUserServiceImpl.java

@@ -604,7 +604,7 @@ public class JobUserServiceImpl implements JobUserService {
         siteUserExp.or().andUserIDEqualTo(userID);
         PcSiteUser curLoginSiteUser = pcSiteUserMapper.selectByExample(siteUserExp).stream().findFirst().orElse(null);
         if(curLoginSiteUser==null){
-            throw new BaseException("", "未能查询到当前登录人的驿站信息！");
+            throw new BaseException("", "未能查询到当前登录人的驿站人员信息！");
         }else{
             PcSiteExample siteExp = new PcSiteExample();
             siteExp.or().andSiteIDEqualTo(curLoginSiteUser.getSiteID());
@@ -709,7 +709,7 @@ public class JobUserServiceImpl implements JobUserService {
                         item.setBirthDay(birthDay);
                     }
                     if(!stringUtils.IsNullOrEmpty(item.getSexName())){
-                        if((sexStr%2==0&&item.getSexName()=="男")||(sexStr%2!=0&&item.getSexName()=="女")){
+                        if((sexStr%2==0&&item.getSexName().equals("男"))||(sexStr%2!=0&&item.getSexName().equals("女"))){
                             errorInfo += "性别与身份证号不匹配！";
                         }
                     }
@@ -749,7 +749,7 @@ public class JobUserServiceImpl implements JobUserService {
                 errorInfo += "请填写所属驿站!";
             else {
                 if (finalCurLoginUserSiteInfo!=null){
-                    if(item.getSiteName()!= finalCurLoginUserSiteInfo.getSiteName()){
+                    if(!item.getSiteName().equals(finalCurLoginUserSiteInfo.getSiteName())){
                         errorInfo += "请填写您所在的驿站名称!";
                     }else{
                         item.setSiteID(finalCurLoginUserSiteInfo.getSiteID());
@@ -849,6 +849,11 @@ public class JobUserServiceImpl implements JobUserService {
                         .findFirst().orElse(new SysDictionaryItem()).getCode());
                 if (item.getRegionCode() == null)
                     errorInfo += "市/县不存在!";
+                else{
+                    if(!item.getRegionCode().equals(finalCurLoginUserSiteInfo.getRegionCode())){
+                        errorInfo += "请选择您所在驿站的市/县!";
+                    }
+                }
             }
 
             if (!stringUtils.IsNullOrEmpty(item.getStreetName())) {
@@ -863,7 +868,7 @@ public class JobUserServiceImpl implements JobUserService {
                         AreaCodeExample curStreetExp = new AreaCodeExample();
                         streetExp.or().andCodeEqualTo(item.getStreetCode());
                         var curStreetReginCode = areaCodeMapper.selectByExample(curStreetExp).get(0).getFid();
-                        if(item.getRegionCode()!= null&&curStreetReginCode!=item.getRegionCode()){
+                        if(item.getRegionCode()!= null&&!curStreetReginCode.equals(item.getRegionCode())){
                             errorInfo += "镇街不属于当前市/县!";
                         }
                     }

vue/src/views/jobUserManager/jobuser/index.vue

@@ -130,10 +130,10 @@
           </div>
           <div>
             <a-button type="primary" html-type="submit" @click='onAdd' functioncode="T01030102">新增</a-button>
-            <BImportExcel functioncode="T01030105"
-                          :options="importOptions"
-                          @success="loadData"
-            ></BImportExcel>
+<!--            <BImportExcel functioncode="T01030105"
+<!--                          :options="importOptions"-->
+<!--                          @success="loadData"-->
+<!--            ></BImportExcel>-->
             <BExportExcel :title="'导出'" :filename="'求职人员信息'" v-show="false"
                           :url="'jobUserService/jobUser/export'"
                           :params="{...exportSearchParams, isExport: true, rows:10000,jobUserIDList:formState.selectedRowKeys.join(',')}"></BExportExcel>