Merge remote-tracking branch 'origin/master_20240722' into master_20240722

yudao-module-personnel/yudao-module-attendance-biz/src/main/java/cn/iocoder/yudao/module/attendance/controller/admin/info/AttendanceInfoController.java

@@ -96,7 +96,7 @@ public class AttendanceInfoController {
                         BeanUtils.toBean(list, AttendanceInfoRespVO.class));
     }
 
-    @GetMapping("/get-import-template")
+    @PostMapping("/get-import-template")
     @Operation(summary = "获得导入考勤模板")
     public void importTemplate(HttpServletResponse response) throws IOException {
         // 手动创建导出 demo

yudao-module-personnel/yudao-module-employee-biz/src/main/java/cn/iocoder/yudao/module/employee/service/info/EmployeeInfoServiceImpl.java

@@ -175,7 +175,9 @@ public class EmployeeInfoServiceImpl implements EmployeeInfoService {
 //            createReqVO.setTenantId(tenantId);
 //        }
         createReqVO.setStatus(CommonStatusEnum.ENABLE.getStatus());
-        createReqVO.setRemainingAnnualLeave(createReqVO.getBaseAnnualLeave().subtract(createReqVO.getUsedAnnualLeave()));
+        if (createReqVO.getBaseAnnualLeave() != null && createReqVO.getUsedAnnualLeave() != null) {
+            createReqVO.setRemainingAnnualLeave(createReqVO.getBaseAnnualLeave().subtract(createReqVO.getUsedAnnualLeave()));
+        }
         // 生成id
         createReqVO.setInfoId(IdUtil.fastSimpleUUID());
         EmployeeInfoDO info = BeanUtils.toBean(createReqVO, EmployeeInfoDO.class);

yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/tenant/TenantServiceImpl.java

@@ -247,7 +247,16 @@ public class TenantServiceImpl implements TenantService {
         }
         // 先判断该租户下员工信息是否存在，如果不存在则创建
         EmployeeRespDTO employeeRespDTO = employeeApi.getEmployee(new EmployeeQueryReqDTO().setUserId(user.getId()).setTenantId(tenant.getId()));
-        if (employeeRespDTO == null) {
+        if (employeeRespDTO != null) {
+            throw exception(USER_TENANT_EMPLOYEE_DUPLICATE, tenant.getName());
+        }
+        EmployeeRespDTO employeeDTO = employeeApi.getEmployee(new EmployeeQueryReqDTO().setPhone(adminUserDO.getMobile()).setTenantId(tenant.getId()));
+        if (employeeDTO != null) {
+            EmployeeSaveReqDTO updateObj = BeanUtils.toBean(employeeDTO, EmployeeSaveReqDTO.class);
+            updateObj.setUserId(user.getId());
+            // 更新员工信息
+            employeeApi.updateEmployee(updateObj);
+        } else {
             // 创建员工信息
             employeeApi.createEmployee(
                     new EmployeeCreateReqDTO()
@@ -259,15 +268,6 @@ public class TenantServiceImpl implements TenantService {
                             .setStatus(CommonStatusEnum.ENABLE.getStatus())
                             .setEmployeeStatus(CommonStatusEnum.ENABLE.getStatus())
             );
-        } else {
-            throw exception(USER_TENANT_EMPLOYEE_DUPLICATE, tenant.getName());
-        }
-        EmployeeRespDTO employeeDTO = employeeApi.getEmployee(new EmployeeQueryReqDTO().setPhone(adminUserDO.getMobile()).setTenantId(tenant.getId()));
-        if (employeeDTO != null) {
-            EmployeeSaveReqDTO updateObj = BeanUtils.toBean(employeeDTO, EmployeeSaveReqDTO.class);
-            updateObj.setUserId(user.getId());
-            // 更新员工信息
-            employeeApi.updateEmployee(updateObj);
         }
         TenantUtils.execute(tenant.getId(), () -> {
             RoleDO roleDO = roleService.selectByName(RoleCodeEnum.COMMON_EMPLOYEE.getName());