yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/service/oa/leave/OaLeaveServiceImpl.java

@@ -195,7 +195,11 @@ public class OaLeaveServiceImpl implements OaLeaveService {
             throw exception(ErrorCodeConstants.OA_EMPLOYEE_NOT_EXISTS);
         }
 
-        if ("年假".equals(commitReqVO.getLeaveType())) {
+        // 请假类型
+        List<DictDataTenantRespDTO> dictDataList = dictDataTenantApi.getDictDataList(DictTypeTenantEnum.TENANT_LEAVE_TYPE.getType());
+        Map<String, String> dictDataMap = CollectionUtils.convertMap(dictDataList, DictDataTenantRespDTO::getValue, DictDataTenantRespDTO::getLabel);
+        String leaveTypeDesc = dictDataMap.get(commitReqVO.getLeaveType());
+        if ("年假".equals(commitReqVO.getLeaveType()) || "年假".equals(leaveTypeDesc)) {
             // 获取剩余年假和申请天数
             BigDecimal remainingAnnualLeave = loginEmployee.getRemainingAnnualLeave();
             String requestDayStr = commitReqVO.getDay(); // 更清晰的变量名
@@ -326,7 +330,11 @@ public class OaLeaveServiceImpl implements OaLeaveService {
             throw exception(ErrorCodeConstants.OA_LEAVE_NOT_EXISTS);
         }
 
-        if ("年假".equals(oaLeave.getLeaveType())) {
+        // 请假类型
+        List<DictDataTenantRespDTO> dictDataList = dictDataTenantApi.getDictDataList(DictTypeTenantEnum.TENANT_LEAVE_TYPE.getType());
+        Map<String, String> dictDataMap = CollectionUtils.convertMap(dictDataList, DictDataTenantRespDTO::getValue, DictDataTenantRespDTO::getLabel);
+        String leaveTypeDesc = dictDataMap.get(oaLeave.getLeaveType());
+        if ("年假".equals(oaLeave.getLeaveType()) || "年假".equals(leaveTypeDesc)) {
             // 请假人
             Long employeeId = oaLeave.getEmployeeId();
             EmployeeRespDTO employee = employeeApi.getEmployeeById(employeeId);
@@ -549,7 +557,11 @@ public class OaLeaveServiceImpl implements OaLeaveService {
             throw exception(ErrorCodeConstants.OA_EMPLOYEE_NOT_EXISTS);
         }
 
-        if ("年假".equals(reCommitReqVO.getLeaveType())) {
+        // 请假类型
+        List<DictDataTenantRespDTO> dictDataList = dictDataTenantApi.getDictDataList(DictTypeTenantEnum.TENANT_LEAVE_TYPE.getType());
+        Map<String, String> dictDataMap = CollectionUtils.convertMap(dictDataList, DictDataTenantRespDTO::getValue, DictDataTenantRespDTO::getLabel);
+        String leaveTypeDesc = dictDataMap.get(reCommitReqVO.getLeaveType());
+        if ("年假".equals(reCommitReqVO.getLeaveType()) || "年假".equals(leaveTypeDesc)) {
             // 获取剩余年假和申请天数
             BigDecimal remainingAnnualLeave = loginEmployee.getRemainingAnnualLeave();
             String requestDayStr = reCommitReqVO.getDay(); // 更清晰的变量名

yudao-module-finance/yudao-module-contract-biz/src/main/resources/mapper/customercontract/CustomerContractMapper.xml

@@ -45,7 +45,7 @@
         finance_customer_contract fcc
         LEFT JOIN employee_info ei ON ei.id = fcc.owner_employee_id AND ei.deleted = 0
         LEFT JOIN system_dept sd ON sd.id = fcc.dept_id AND sd.deleted = 0
-        LEFT JOIN employee_info ei2 ON ei2.id = fcc.creator AND ei2.deleted = 0
+        LEFT JOIN employee_info ei2 ON ei2.user_id = fcc.creator AND ei2.deleted = 0
         WHERE
         fcc.deleted = 0
         <if test="page.customerContractCode != null and page.customerContractCode != ''">
@@ -135,7 +135,7 @@
         finance_customer_contract fcc
         LEFT JOIN employee_info ei ON ei.id = fcc.owner_employee_id AND ei.deleted = 0
         LEFT JOIN system_dept sd ON sd.id = fcc.dept_id AND sd.deleted = 0
-        LEFT JOIN employee_info ei2 ON ei2.id = fcc.creator AND ei2.deleted = 0
+        LEFT JOIN employee_info ei2 ON ei2.user_id = fcc.creator AND ei2.deleted = 0
         LEFT JOIN customer_info ci ON ci.id = fcc.customer_id AND ci.deleted = 0
         WHERE
         fcc.deleted = 0

yudao-module-finance/yudao-module-contract-biz/src/main/resources/mapper/suppliercontract/SupplierContractHistoryMapper.xml

@@ -16,7 +16,7 @@
             finance_supplier_contract_history fsch
             LEFT JOIN employee_info ei ON ei.id = fsch.owner_employee_id AND ei.deleted = 0
             LEFT JOIN system_dept sd ON sd.id = fsch.dept_id AND sd.deleted = 0
-            LEFT JOIN employee_info ei2 ON ei2.id = fsch.creator AND ei2.deleted = 0
+            LEFT JOIN employee_info ei2 ON ei2.user_id = fsch.creator AND ei2.deleted = 0
         WHERE
             fsch.deleted = 0
         <if test="code != null and code != ''">
@@ -76,7 +76,7 @@
             finance_supplier_contract_history fsch
                 LEFT JOIN employee_info ei ON ei.id = fsch.owner_employee_id AND ei.deleted = 0
                 LEFT JOIN system_dept sd ON sd.id = fsch.dept_id AND sd.deleted = 0
-                LEFT JOIN employee_info ei2 ON ei2.id = fsch.creator AND ei2.deleted = 0
+                LEFT JOIN employee_info ei2 ON ei2.user_id = fsch.creator AND ei2.deleted = 0
         WHERE
             fsch.deleted = 0
         <if test="code != null and code != ''">

yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/dingding/DingThirdAuthController.java

@@ -134,12 +134,12 @@ public class DingThirdAuthController {
         if (Objects.isNull(adminUserDO)) {
             //创建用户信息
             UserSaveReqVO userSaveReqVO = new UserSaveReqVO();
-            userSaveReqVO.setUsername(result.getUnionId());
+            userSaveReqVO.setUsername(result.getMobile());
             userSaveReqVO.setNickname(result.getNick());
             userSaveReqVO.setEmail(result.getEmail());
             userSaveReqVO.setMobile(result.getMobile());
             userSaveReqVO.setAvatar(result.getAvatarUrl());
-            userSaveReqVO.setPassword(result.getMobile());
+            userSaveReqVO.setPassword(result.getMobile() + ".1@2");
 
             adminUserDO = dingAuthServiceInfo.initUser(userSaveReqVO, corpId, adminType);
         }

yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/auth/AdminAuthServiceImpl.java

@@ -152,7 +152,7 @@ public class AdminAuthServiceImpl implements AdminAuthService {
         userSaveReqVO.setUsername(reqVO.getMobile());
         userSaveReqVO.setNickname(reqVO.getMobile());
         userSaveReqVO.setMobile(reqVO.getMobile());
-        userSaveReqVO.setPassword(reqVO.getMobile());
+        userSaveReqVO.setPassword(reqVO.getMobile() + ".1@2");
         Long id = userService.smsRegister(userSaveReqVO);
         // 获得新用户信息
         user = userService.getUserByMobile(reqVO.getMobile());