Merge branch 'master' of http://114.55.67.98:8070/Natural_p1/zjugis_OA

client/src/views/OaSystem/attendanceCenter/dep.vue

@@ -7,7 +7,7 @@
           <span class="span">月份：</span>
           <el-date-picker v-model="fromParams.month" type="month" placeholder="请选择月份" />
         </div>
-        <!-- <div class="searBox">
+        <div class="searBox" v-if="porps.deptsName == '公司'">
           <span class="span">部门：</span>
           <DeptTree
             v-model="fromParams['deptId']"
@@ -15,7 +15,7 @@
             :disabled="porps.deptsName !== '公司'"
             check-strictly
           />
-        </div> -->
+        </div>
         <div class="searBox">
           <span class="span">人员：</span>
           <el-input v-model="fromParams.userName" placeholder="请输入人员名称" />
@@ -241,27 +241,50 @@ const initInsMouth = async (date: any) => {
     nickname: fromParams.value.userName, //用户昵称
     deptId: fromParams.value.deptId //部门ID
   }
-  initWorkDay(date).then((restall) => {
-    MineApi.getWorkdaySheetDeptList(params).then((res) => {
-      let namesArr: any = isArrayDelOrNickname(JSON.parse(JSON.stringify(res)))
-      let resArr: any = res
-      resArr.forEach((item: any) => {
-        if (item.attendanceTime) {
-          item.date = moment(item.attendanceTime).format('YYYY-MM-DD')
-        } else {
-          item.date = moment(item.attendanceDate).format('YYYY-MM-DD')
-        }
+  let urlApi = initWorkDay(date).then((restall) => {
+    if (porps.deptsName == '公司') {
+      MineApi.getWorkdaySheetList(params).then((res) => {
+        let namesArr: any = isArrayDelOrNickname(JSON.parse(JSON.stringify(res)))
+        let resArr: any = res
+        resArr.forEach((item: any) => {
+          if (item.attendanceTime) {
+            item.date = moment(item.attendanceTime).format('YYYY-MM-DD')
+          } else {
+            item.date = moment(item.attendanceDate).format('YYYY-MM-DD')
+          }
+        })
+        let arr = allDeptsArr(restall, resArr, namesArr)
+        let sbArr = depSort(deptSort.value, arr)
+
+        // 导出数据
+        excelDataSource.value = getExcelTable(sbArr)
+
+        tableData.value = sbArr
+        pagesList.value.total = arr.length
+        tableLoading.value = false
       })
-      let arr = allDeptsArr(restall, resArr, namesArr)
-      let sbArr = depSort(deptSort.value, arr)
-
-      // 导出数据
-      excelDataSource.value = getExcelTable(sbArr)
-
-      tableData.value = sbArr
-      pagesList.value.total = arr.length
-      tableLoading.value = false
-    })
+    } else {
+      MineApi.getWorkdaySheetDeptList(params).then((res) => {
+        let namesArr: any = isArrayDelOrNickname(JSON.parse(JSON.stringify(res)))
+        let resArr: any = res
+        resArr.forEach((item: any) => {
+          if (item.attendanceTime) {
+            item.date = moment(item.attendanceTime).format('YYYY-MM-DD')
+          } else {
+            item.date = moment(item.attendanceDate).format('YYYY-MM-DD')
+          }
+        })
+        let arr = allDeptsArr(restall, resArr, namesArr)
+        let sbArr = depSort(deptSort.value, arr)
+
+        // 导出数据
+        excelDataSource.value = getExcelTable(sbArr)
+
+        tableData.value = sbArr
+        pagesList.value.total = arr.length
+        tableLoading.value = false
+      })
+    }
   })
 }
 const sco = (row, item, index) => {

zjugis-module-adm/zjugis-module-adm-biz/src/main/java/com/zjugis/module/adm/service/attendance/AttendanceSheetServiceImpl.java

@@ -193,12 +193,12 @@ public class AttendanceSheetServiceImpl implements AttendanceSheetService {
 
     @Override
     public List<AttendanceSheetRespVO> getAttendanceSheetDeptList(AttendanceSheetListReqVO listReqVO) {
-        Set<String> deptIds = null;
+        Set<String> deptIds = new HashSet<>();
         DeptDataPermissionRespDTO respDTO = permissionApi.getDeptDataPermission(SecurityFrameworkUtils.getLoginUserId()).getCheckedData();
         if(!respDTO.getAll()){
             deptIds = respDTO.getDeptIds();
-            deptIds.add(listReqVO.getDeptId());
         }
+        deptIds.add(listReqVO.getDeptId());
         Map<String, DeptRespDTO> deptMap = deptApi.getDeptMap(deptIds);
         List<AttendanceSheetDO> list = attendanceSheetMapper.selectList(listReqVO, deptIds);
         List<AttendanceSheetRespVO> resultList = AttendanceSheetConvert.INSTANCE.convertList(list);