diff --git a/platform-biz-service/src/main/java/com/lyms/platform/permission/model/Users.java b/platform-biz-service/src/main/java/com/lyms/platform/permission/model/Users.java index 9f7e05d..dcd73f1 100644 --- a/platform-biz-service/src/main/java/com/lyms/platform/permission/model/Users.java +++ b/platform-biz-service/src/main/java/com/lyms/platform/permission/model/Users.java @@ -22,7 +22,15 @@ public class Users { private Date created; private String remarks; private Date lastLoginTime; + private Integer otherAccount; //第三方帐号, 1医院帐号 + public Integer getOtherAccount() { + return otherAccount; + } + + public void setOtherAccount(Integer otherAccount) { + this.otherAccount = otherAccount; + } private List roles; private Departments departmentses; 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 f631836..f8e43a8 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 @@ -29,6 +29,15 @@ public class UsersQuery extends BaseQuery { private String keyword; private Integer roleId; private String foreignId; + private Integer otherAccount; //ʺ, 1ҽԺʺ + + public Integer getOtherAccount() { + return otherAccount; + } + + public void setOtherAccount(Integer otherAccount) { + this.otherAccount = otherAccount; + } public String getForeignId() { return foreignId; diff --git a/platform-biz-service/src/main/resources/mainOrm/Users.xml b/platform-biz-service/src/main/resources/mainOrm/Users.xml index e0955b3..ad4b6d6 100644 --- a/platform-biz-service/src/main/resources/mainOrm/Users.xml +++ b/platform-biz-service/src/main/resources/mainOrm/Users.xml @@ -22,6 +22,7 @@ + @@ -100,12 +101,12 @@ delete from users where id = #{id,jdbcType=INTEGER} @@ -180,6 +181,9 @@ select id,logincenter_id,type,org_id,dept_id,name,account,pwd,phone,publish_id,p and last_login_time = #{lastLoginTime,jdbcType=TIMESTAMP} + + and other_account = #{otherAccount,jdbcType=INTEGER} + @@ -187,7 +191,7 @@ select id,logincenter_id,type,org_id,dept_id,name,account,pwd,phone,publish_id,p select DISTINCT u.id id,logincenter_id,type,org_id,dept_id,name,account,pwd,phone,publish_id,publish_name,u.yn,enable,modified,created,remarks,last_login_time, - ks_id,foreign_id + ks_id,foreign_id,other_account from users u LEFT JOIN user_role_maps ur on u.id = ur.user_id where 1=1 diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/UsersController.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/UsersController.java index a2d6db5..ab4fb08 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/UsersController.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/UsersController.java @@ -742,7 +742,7 @@ public class UsersController extends BaseController { //修改了手机号,不能修改已存在的手机号 - if(!phone.equals(users.getPhone())) { + if(!users.getOtherAccount().equals(1) && !phone.equals(users.getPhone())) { //检查账户是否存在 UsersQuery usersQuery = new UsersQuery(); usersQuery.setPhone(phone);