diff --git a/platform-biz-service/src/main/java/com/lyms/platform/permission/model/UsersQuery.java b/platform-biz-service/src/main/java/com/lyms/platform/permission/model/UsersQuery.java
index a2866e4..53578c3 100644
--- a/platform-biz-service/src/main/java/com/lyms/platform/permission/model/UsersQuery.java
+++ b/platform-biz-service/src/main/java/com/lyms/platform/permission/model/UsersQuery.java
@@ -1,19 +1,42 @@
package com.lyms.platform.permission.model;
-
import com.lyms.platform.common.dao.BaseQuery;
import java.util.Date;
+public class UsersQuery extends BaseQuery {
+ private Integer id;
+ private Integer logincenterId;
+ private Integer type;
+ private Integer orgId;
+ private Integer deptId;
+ private String name;
+ private String account;
+ private String pwd;
+ private String phone;
+ private Integer publishId;
+ private String publishName;
+ private Integer yn;
+ private Integer enable;
+ private Date modified;
+ private Date created;
+ private String remarks;
+ private Date lastLoginTime;
+ private Integer ksId;
-public class UsersQuery extends BaseQuery {private Integer id;private Integer logincenterId;private Integer type;private Integer orgId;private Integer deptId;private String name;private String account;private String pwd;private String phone;private Integer publishId;private String publishName;private Integer yn;private Integer enable;private Date modified;private Date created;private String remarks;private Date lastLoginTime;
+ public Integer getKsId() {
+ return ksId;
+ }
-public Integer getId() {
- return id;
+ public void setKsId(Integer ksId) {
+ this.ksId = ksId;
}
+ public Integer getId() {
+ return id;
+ }
public void setId(Integer id) {
@@ -21,177 +44,161 @@ public Integer getId() {
}
-public Integer getLogincenterId() {
+ public Integer getLogincenterId() {
return logincenterId;
}
-
public void setLogincenterId(Integer logincenterId) {
this.logincenterId = logincenterId;
}
-public Integer getType() {
+ public Integer getType() {
return type;
}
-
public void setType(Integer type) {
this.type = type;
}
-public Integer getOrgId() {
+ public Integer getOrgId() {
return orgId;
}
-
public void setOrgId(Integer orgId) {
this.orgId = orgId;
}
-public Integer getDeptId() {
+ public Integer getDeptId() {
return deptId;
}
-
public void setDeptId(Integer deptId) {
this.deptId = deptId;
}
-public String getName() {
+ public String getName() {
return name;
}
-
public void setName(String name) {
this.name = name;
}
-public String getAccount() {
+ public String getAccount() {
return account;
}
-
public void setAccount(String account) {
this.account = account;
}
-public String getPwd() {
+ public String getPwd() {
return pwd;
}
-
public void setPwd(String pwd) {
this.pwd = pwd;
}
-public String getPhone() {
+ public String getPhone() {
return phone;
}
-
public void setPhone(String phone) {
this.phone = phone;
}
-public Integer getPublishId() {
+ public Integer getPublishId() {
return publishId;
}
-
public void setPublishId(Integer publishId) {
this.publishId = publishId;
}
-public String getPublishName() {
+ public String getPublishName() {
return publishName;
}
-
public void setPublishName(String publishName) {
this.publishName = publishName;
}
-public Integer getYn() {
+ public Integer getYn() {
return yn;
}
-
public void setYn(Integer yn) {
this.yn = yn;
}
-public Integer getEnable() {
+ public Integer getEnable() {
return enable;
}
-
public void setEnable(Integer enable) {
this.enable = enable;
}
-public Date getModified() {
+ public Date getModified() {
return modified;
}
-
public void setModified(Date modified) {
this.modified = modified;
}
-public Date getCreated() {
+ public Date getCreated() {
return created;
}
-
public void setCreated(Date created) {
this.created = created;
}
-public String getRemarks() {
+ public String getRemarks() {
return remarks;
}
-
public void setRemarks(String remarks) {
this.remarks = remarks;
}
-public Date getLastLoginTime() {
+ public Date getLastLoginTime() {
return lastLoginTime;
}
-
public void setLastLoginTime(Date lastLoginTime) {
this.lastLoginTime = lastLoginTime;
diff --git a/platform-biz-service/src/main/resources/mainOrm/Users.xml b/platform-biz-service/src/main/resources/mainOrm/Users.xml
index d70ed06..29e3aa7 100644
--- a/platform-biz-service/src/main/resources/mainOrm/Users.xml
+++ b/platform-biz-service/src/main/resources/mainOrm/Users.xml
@@ -8,6 +8,7 @@
+
@@ -25,7 +26,7 @@
-insert into users (logincenter_id,type,org_id,dept_id,name,account,pwd,phone,publish_id,publish_name,yn,enable,modified,created,remarks,last_login_time) values (#{logincenterId},#{type},#{orgId},#{deptId},#{name},#{account},#{pwd},#{phone},#{publishId},#{publishName},#{yn},#{enable},#{modified},#{created},#{remarks},#{lastLoginTime})
+insert into users (logincenter_id,type,org_id,dept_id,name,account,pwd,phone,publish_id,publish_name,yn,enable,modified,created,remarks,last_login_time,ks_id) values (#{logincenterId},#{type},#{orgId},#{deptId},#{name},#{account},#{pwd},#{phone},#{publishId},#{publishName},#{yn},#{enable},#{modified},#{created},#{remarks},#{lastLoginTime},#{ksId})
@@ -43,6 +44,9 @@ org_id = #{orgId,jdbcType=INTEGER},
dept_id = #{deptId,jdbcType=INTEGER},
+
+ ks_id = #{ksId,jdbcType=INTEGER},
+
name = #{name,jdbcType=VARCHAR},
@@ -91,12 +95,12 @@ delete from users where id = #{id,jdbcType=INTEGER}
@@ -128,8 +132,11 @@ and type = #{type,jdbcType=INTEGER}
and org_id = #{orgId,jdbcType=INTEGER}
-and dept_id = #{deptId,jdbcType=INTEGER}
+ and dept_id = #{deptId,jdbcType=INTEGER}
+
+ and ks_id = #{ksId,jdbcType=INTEGER}
+
and name = #{name,jdbcType=VARCHAR}
@@ -172,7 +179,7 @@ and last_login_time = #{lastLoginTime,jdbcType=TIMESTAMP}