Merge branch 'master' of http://gitlab.scsmile.cn/zxf/attendance-performance-platform

attendance-performance-manager-ui/admin/src/components/SearchForm.vue

@@ -361,10 +361,9 @@ export default {
             }
           }
         });
-        console.log("search val",val)
         newData[item] = this.decodeVal(val);
       });
-      console.log("search val1",val)
+     
       return newData;
     },
     decodeVal(val) {

attendance-performance-manager-ui/admin/src/views/staff/perform/summary/list.vue

 <template>
   <div class="page">
     <LayoutTable :data="tableData" notAdd notDel :config="tableConfig">
-      <el-button
-        slot="table-head-left2"
-        style="margin-left: 10px"
-        icon="el-icon-tickets"
-        size="mini"
-        @click="doExport"
-        :disabled="isExport"
-        >导出</el-button
-      >
+      <el-button slot="table-head-left2" style="margin-left: 10px" icon="el-icon-tickets" size="mini" @click="doExport"
+        :disabled="isExport">导出</el-button>
     </LayoutTable>
 
     <dialog-show ref="dialogform" @ok="getData" />
@@ -26,7 +19,7 @@ export default {
     dialogShow,
   },
   mixins: [table],
-  created() {},
+  created() { },
   methods: {
     /** 导出Excel */
     doExport() {

attendance-performance-manager/src/main/java/com/mortals/xhx/module/job/model/JobEntity.java

@@ -159,7 +159,7 @@ public class JobEntity extends JobVo {
 
     public void initAttrValue(){
 
-        this.groupId = 0L;
+        this.groupId = null;
 
         this.groupName = "";