diff --git a/ssjygl-xsx-common/src/main/java/com/cowr/model/base/BaseSysuser.java b/ssjygl-xsx-common/src/main/java/com/cowr/model/base/BaseSysuser.java index bc0014a..b760917 100644 --- a/ssjygl-xsx-common/src/main/java/com/cowr/model/base/BaseSysuser.java +++ b/ssjygl-xsx-common/src/main/java/com/cowr/model/base/BaseSysuser.java @@ -219,6 +219,29 @@ public abstract class BaseSysuser> extends BaseModel return getInt("role"); } + /** + * name: first_login + * type: INT(1) + * isNullable: NO + * isPrimaryKey: NO + * defaultValue: 0 + * + * @param firstLogin 是否修改密码:0未修改,1已修改 + */ + @JSONField(name = "first_login") + public void setFirstLogin(java.lang.Integer firstLogin) { + set("first_login", firstLogin); + } + + + /** + * @return firstLogin 是否修改密码:0未修改,1已修改 + */ + @JSONField(name = "first_login") + public java.lang.Integer getFirstLogin() { + return getInt("first_login"); + } + /** * name: del * type: INT(10) diff --git a/ssjygl-xsx-local/src/main/java/com/cowr/local/ssjygl/system/sysuser/SysuserSyncService.java b/ssjygl-xsx-local/src/main/java/com/cowr/local/ssjygl/system/sysuser/SysuserSyncService.java index 9f5b3cf..f88783f 100644 --- a/ssjygl-xsx-local/src/main/java/com/cowr/local/ssjygl/system/sysuser/SysuserSyncService.java +++ b/ssjygl-xsx-local/src/main/java/com/cowr/local/ssjygl/system/sysuser/SysuserSyncService.java @@ -395,10 +395,16 @@ public class SysuserSyncService extends BaseService { return Result.failed(false, "修改失败"); } - SyncTask synctask = new SyncTask(); - String newmd5 = getPwdMD5(sysuser.getPhone(), newpwd); + SyncTask synctask = new SyncTask(); + String newmd5 = getPwdMD5(sysuser.getPhone(), newpwd); + String defaultmd5 = getPwdMD5(sysuser.getPhone(), Const.DEFAULT_PASSWORD); + + if (sysuser.getFirstLogin() == 0 && newmd5.equals(defaultmd5)) { + return Result.failed(false, "修改的密码不能与初始密码一致"); + } sysuser.setPassword(newmd5); + sysuser.setFirstLogin(1); boolean ret = Db.tx(new IAtom() { @Override diff --git a/ssjygl-xsx-service/src/main/java/com/cowr/service/ssjygl/system/sysuser/SysuserSyncService.java b/ssjygl-xsx-service/src/main/java/com/cowr/service/ssjygl/system/sysuser/SysuserSyncService.java index aa3c377..0dcc5ef 100644 --- a/ssjygl-xsx-service/src/main/java/com/cowr/service/ssjygl/system/sysuser/SysuserSyncService.java +++ b/ssjygl-xsx-service/src/main/java/com/cowr/service/ssjygl/system/sysuser/SysuserSyncService.java @@ -650,9 +650,15 @@ public class SysuserSyncService extends BaseSyncService { return Result.failed(false, "修改失败"); } - String newmd5 = getPwdMD5(sysuser.getPhone(), newpwd); + String newmd5 = getPwdMD5(sysuser.getPhone(), newpwd); + String defaultmd5 = getPwdMD5(sysuser.getPhone(), Const.DEFAULT_PASSWORD); + + if (sysuser.getFirstLogin() == 0 && newmd5.equals(defaultmd5)) { + return Result.failed(false, "修改的密码不能与初始密码一致"); + } sysuser.setPassword(newmd5); + sysuser.setFirstLogin(1); boolean ret = Db.tx(new IAtom() { @Override @@ -702,6 +708,7 @@ public class SysuserSyncService extends BaseSyncService { Sysuser old = sysuser.clone(); sysuser.setPassword(getPwdMD5(sysuser.getPhone(), Const.DEFAULT_PASSWORD)); + sysuser.setFirstLogin(0); boolean ret = Db.tx(new IAtom() { @Override