Crazy 7 ماه پیش
والد
کامیت
439beecdbd

+ 3 - 0
yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/dept/vo/dept/DeptListReqVO.java

@@ -19,4 +19,7 @@ public class DeptListReqVO {
     @Schema(description = "电话")
     @Schema(description = "电话")
     private String phone;
     private String phone;
 
 
+    @Schema(description = "邮箱")
+    private String email;
+
 }
 }

+ 3 - 1
yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/dal/mysql/dept/DeptMapper.java

@@ -8,6 +8,7 @@ import cn.iocoder.yudao.module.system.dal.dataobject.dept.DeptDO;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Mapper;
 
 
 import java.util.Collection;
 import java.util.Collection;
+import java.util.Collections;
 import java.util.List;
 import java.util.List;
 
 
 @Mapper
 @Mapper
@@ -15,8 +16,9 @@ public interface DeptMapper extends BaseMapperX<DeptDO> {
 
 
     default List<DeptDO> selectList(DeptListReqVO reqVO) {
     default List<DeptDO> selectList(DeptListReqVO reqVO) {
         return selectList(new LambdaQueryWrapperX<DeptDO>()
         return selectList(new LambdaQueryWrapperX<DeptDO>()
-                .eqIfPresent(DeptDO::getLeaderUserId,reqVO.getLeaderUserId())
+                .inIfPresent(DeptDO::getLeaderUserId, Collections.singletonList(reqVO.getLeaderUserId()))
                 .likeIfPresent(DeptDO::getPhone, reqVO.getPhone())//电话
                 .likeIfPresent(DeptDO::getPhone, reqVO.getPhone())//电话
+                .likeIfPresent(DeptDO::getEmail,reqVO.getEmail())
                 .likeIfPresent(DeptDO::getName, reqVO.getName())
                 .likeIfPresent(DeptDO::getName, reqVO.getName())
                 .eqIfPresent(DeptDO::getStatus, reqVO.getStatus()));
                 .eqIfPresent(DeptDO::getStatus, reqVO.getStatus()));
     }
     }