OK

src/main/java/com/hz/employmentsite/services/impl/companyService/CompanyServiceImpl.java

@@ -200,7 +200,7 @@ public class CompanyServiceImpl implements CompanyService {
             result = pcCompanyMapper.updateByPrimaryKeySelective(dbData);
         }
 
-        if(data.listLabel.size()>0){
+        if(data.listLabel!=null && data.listLabel.size()>0){
             PcLabelCompanyExample labelEmp = new PcLabelCompanyExample();
             labelEmp.or().andCompanyIDEqualTo(data.getCompanyID());
             pcLabelCompanyMapper.deleteByExample(labelEmp);
@@ -225,9 +225,13 @@ public class CompanyServiceImpl implements CompanyService {
             if( curCompanyPostList != null && curCompanyPostList.size() > 0){
                 throw new BaseException("10004","所选企业已有关联岗位信息，不允许删除！");
             }else{
-                PcCompanyExample contactExample = new PcCompanyExample();
-                contactExample.or().andCompanyIDEqualTo(curCompanyID);
-                result += pcCompanyMapper.deleteByExample(contactExample);
+                int count = pcCompanyMapper.deleteByPrimaryKey(curCompanyID);
+                if(count>0){
+                    PcLabelCompanyExample labelEmp = new PcLabelCompanyExample();
+                    labelEmp.or().andCompanyIDEqualTo(curCompanyID);
+                    pcLabelCompanyMapper.deleteByExample(labelEmp);
+                }
+                result+=count;
             }
         }
         return result;

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

@@ -170,9 +170,13 @@ public class JobUserServiceImpl implements JobUserService {
             if( curJobUserHuntList != null && curJobUserHuntList.size()>0){
                 throw new BaseException("10004","所选求职人员已有关联的求职意向，不允许删除！");
             }else{
-                PcJobuserExample jobuserExp = new PcJobuserExample();
-                jobuserExp.or().andJobuserIDIn(ids);
-                result += pcJobuserMapper.deleteByExample(jobuserExp);
+                int count = pcJobuserMapper.deleteByPrimaryKey(curJobUserID);
+                if(count>0){
+                    PcLabelJobuserExample labelEmp = new PcLabelJobuserExample();
+                    labelEmp.or().andJobuserIDEqualTo(curJobUserID);
+                    pcLabelJobuserMapper.deleteByExample(labelEmp);
+                }
+                result+=count;
             }
         }
         return result;
@@ -347,7 +351,7 @@ public class JobUserServiceImpl implements JobUserService {
             });
         }
 
-        if(data.listLabel.size()>0){
+        if(data.listLabel!=null && data.listLabel.size()>0){
             PcLabelJobuserExample labelEmp = new PcLabelJobuserExample();
             labelEmp.or().andJobuserIDEqualTo(data.getJobUserID());
             pcLabelJobuserMapper.deleteByExample(labelEmp);

vue/src/views/baseSettings/label/selectLabel.vue

@@ -14,7 +14,7 @@
       <a-divider orientation="left">基础标签</a-divider>
       <a-row :gutter="24">
         <a-col :span="24">
-          <a-button :style="{marginLeft: '10px',background:item.check?'#1890ff':'#fff'}" v-for="item in basicsLabelList"
+          <a-button :style="{margin: ' 0px 5px 5px 0px',background:item.check?'#1890ff':'#fff'}" v-for="item in basicsLabelList"
                     @click="item.check=!item.check">
             {{ item.labelName }}
           </a-button>
@@ -23,7 +23,7 @@
       <a-divider orientation="left">自定义标签</a-divider>
       <a-row :gutter="24">
         <a-col :span="24">
-          <a-button :style="{marginLeft: '10px',background:item.check?'#1890ff':'#fff'}" v-for="item in customLabelList"
+          <a-button :style="{margin: ' 0px 5px 5px 0px',background:item.check?'#1890ff':'#fff'}" v-for="item in customLabelList"
                     @click="item.check=!item.check">
             {{ item.labelName }}
           </a-button>