Explorar el Código

fix: EmployeeMapper撤回无XML映射的自定义方法,handler仅设tenantId(已在白名单)

alphaH hace 1 día
padre
commit
103ca06df8

+ 0 - 14
java/src/main/java/com/payment/platform/module/payment/employee/mapper/EmployeeMapper.java

@@ -1,23 +1,9 @@
 package com.payment.platform.module.payment.employee.mapper;
 
-import com.baomidou.mybatisplus.annotation.InterceptorIgnore;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.payment.platform.module.payment.employee.entity.EmployeeEntity;
 import org.apache.ibatis.annotations.Mapper;
-import org.apache.ibatis.annotations.Param;
-import org.apache.ibatis.annotations.Select;
-import org.apache.ibatis.annotations.Update;
 
 @Mapper
 public interface EmployeeMapper extends BaseMapper<EmployeeEntity> {
-
-    @InterceptorIgnore(tenantLine = "true")
-    @Select("SELECT * FROM pay_employee WHERE employee_id = #{employeeId} AND enterprise_id = #{enterpriseId}")
-    EmployeeEntity selectByEmployeeIdIgnoreTenant(@Param("employeeId") String employeeId, @Param("enterpriseId") String enterpriseId);
-
-    @InterceptorIgnore(tenantLine = "true")
-    int insertIgnoreTenant(EmployeeEntity entity);
-
-    @InterceptorIgnore(tenantLine = "true")
-    int updateByIdIgnoreTenant(@Param("et") EmployeeEntity entity);
 }

+ 5 - 5
java/src/main/java/com/payment/platform/module/payment/notification/handler/EmployeeHandler.java

@@ -97,13 +97,13 @@ public class EmployeeHandler extends BaseNotifyHandler {
         String enterpriseId = params.get("enterprise_id");
         log.info("员工新增: employee_id={}, enterprise_id={}", employeeId, enterpriseId);
 
-        EmployeeEntity existing = employeeMapper.selectByEmployeeIdIgnoreTenant(employeeId, enterpriseId);
+        EmployeeEntity existing = employeeMapper.selectOne(new LambdaQueryWrapper<EmployeeEntity>().eq(EmployeeEntity::getEmployeeId, employeeId).eq(EmployeeEntity::getEnterpriseId, enterpriseId));
         if (existing != null) {
             updateEmployeeFromParams(existing, params);
-            employeeMapper.updateByIdIgnoreTenant(existing);
+            employeeMapper.updateById(existing);
         } else {
             EmployeeEntity entity = buildEmployeeFromParams(params);
-            employeeMapper.insertIgnoreTenant(entity);
+            employeeMapper.insert(entity);
         }
     }
 
@@ -219,7 +219,7 @@ public class EmployeeHandler extends BaseNotifyHandler {
     private EmployeeEntity findOrCreateEmployee(Map<String, String> params) {
         String employeeId = params.get("employee_id");
         String enterpriseId = params.get("enterprise_id");
-        EmployeeEntity entity = employeeMapper.selectByEmployeeIdIgnoreTenant(employeeId, enterpriseId);
+        EmployeeEntity entity = employeeMapper.selectOne(new LambdaQueryWrapper<EmployeeEntity>().eq(EmployeeEntity::getEmployeeId, employeeId).eq(EmployeeEntity::getEnterpriseId, enterpriseId));
         if (entity == null) {
             entity = new EmployeeEntity();
             entity.setEmployeeId(employeeId);
@@ -232,7 +232,7 @@ public class EmployeeHandler extends BaseNotifyHandler {
         EmployeeEntity entity = findOrCreateEmployee(params);
         updateEmployeeFromParams(entity, params);
         if (entity.getId() == null) {
-            employeeMapper.insertIgnoreTenant(entity);
+            employeeMapper.insert(entity);
         } else {
             employeeMapper.updateById(entity);
         }