diff --git a/fys-modules/fys-customer/src/main/java/com/fuyuanshen/customer/domain/query/UserQueryCriteria.java b/fys-modules/fys-customer/src/main/java/com/fuyuanshen/customer/domain/query/UserQueryCriteria.java index c454b4a..94526cf 100644 --- a/fys-modules/fys-customer/src/main/java/com/fuyuanshen/customer/domain/query/UserQueryCriteria.java +++ b/fys-modules/fys-customer/src/main/java/com/fuyuanshen/customer/domain/query/UserQueryCriteria.java @@ -50,6 +50,12 @@ public class UserQueryCriteria extends BaseEntity { @Schema(name = "是否启用") private Boolean enabled; + /** + * 帐号状态(0正常 1停用) + */ + @Schema(name = "帐号状态(0正常 1停用)") + private String status; + @Schema(name = "部门ID") private Long deptId; diff --git a/fys-modules/fys-customer/src/main/resources/mapper/customer/CustomerMapper.xml b/fys-modules/fys-customer/src/main/resources/mapper/customer/CustomerMapper.xml index c0c229c..21e91bc 100644 --- a/fys-modules/fys-customer/src/main/resources/mapper/customer/CustomerMapper.xml +++ b/fys-modules/fys-customer/src/main/resources/mapper/customer/CustomerMapper.xml @@ -68,8 +68,8 @@ and u1.user_id = #{criteria.id} - - and u1.enabled = #{criteria.enabled} + + and u.status = #{criteria.status} and u1.dept_id in @@ -109,8 +109,8 @@ and u.nick_name like concat('%', TRIM(#{criteria.blurry}), '%') - - and u.enabled = #{criteria.enabled} + + and u.status = #{criteria.status} and u.create_time between #{criteria.params.beginTime} and #{criteria.params.endTime} @@ -139,8 +139,8 @@ and u.nick_name like concat('%', TRIM(#{criteria.blurry}), '%') - - and u.enabled = #{criteria.enabled} + + and u.status = #{criteria.status} and u.create_time between #{criteria.params.beginTime} and #{criteria.params.endTime}