From 30d9c1885f508f50b52fd29aa080b50ceaa8158a Mon Sep 17 00:00:00 2001
From: zhaohe <h_zhaohe@163.com>
Date: Sat, 21 Sep 2024 16:05:21 +0800
Subject: [PATCH] update

---
 app.db                                             | Bin 204800 -> 204800 bytes
 src/main/java/a8k/dbservice/AppUsrDBService.java   |  14 +++++++++----
 src/main/java/a8k/dbservice/type/AppUser.java      |   4 ++--
 .../java/a8k/service/app/AppUserMgrService.java    |  22 ++++++++++-----------
 4 files changed, 22 insertions(+), 18 deletions(-)

diff --git a/app.db b/app.db
index e0426df0b1cdb454e5500f7a16f80111cb4743bf..152246acc7abe5f02584ddc6c704fda26d496127 100644
GIT binary patch
delta 708
zcma)&y^0h;6ova|W*FBUOOeH46;|m$lMA=1tGn*a)CVw|e7d^pf`JAa3eFhpX2LEe
z1}1`NCbEkd3Hty(fDfR%shO$OqZk;tQ^85jJ?Bv0@_2K3yt%)fUD`glb~oy?`R+XZ
zIM1FuT}T-`H;n+1MX)s@_>MbZ%b^t0VJNX+%~}M9!`aozSXW|0C<6$g2FnhCJP9CL
zZfrvxTT_q|8xw<7!q*h6Fhk{?1?yb}%mJa+&BBn;<e6+C(puJ-uOb{`dFvgtr7ppW
zbKonsAYB`zs<}aj1=S){WA=N*_*Ro^pss2G+pvRJ;(?-QkB*5jZp4Jfbd_jKjg>XT
zU|KQpCuqPsbU>BvjO$0FkC35qBT15xI-e-3_SDx;7nWJ7)?zohmCw?3kPZ98|B(6%
zYS16{d=_T`%2$<ZaLI1wvvWO;vuI2rhU8)|@f}TW|J->u_>kd7t_~A*qQ0oZqZ`-X
zsC(0Vl<aI>8K1s?eY(H*{otiGrM}ZWxc_jPjgn&P^7!P%^KYMDMF&mq%^p9RrvEzn
KkMs6NhQ9#tS+oKG

delta 680
zcma)&J!=$E6ozMJKiFv2iG*NKA;lEh95{FG*EwDEKWx8u?gv<Cp{3xih3SL@8w(p7
z?L-KYO4uKeTKoZ;w05@MS;5lmTb$;;59gj|x!PW?wvTUDJKs+3KFssw{MEetGOwP$
zSU6*(vrd4Nl0gZIzz!pL3K%+)()!r2V387zMzcH9iAchGX%u*m22^wboOcLJoetI^
zX=fU;No8WVCO8RVq7H%y2~^7xI0gX<^#YYQjFM85l2<HnutqRC9Yp?7z!pJqbif=V
z=%jU*lF?n~8!{=8!D>yk(F(^bKx?v~f{);wL5LkY&xkQuop)qHVEOkDOQ@q4Eszol
zl%^Is-+E{zJ1ddM2+RnzB(D`kF|Mx{^-=x3R%bVsRatN3ZhU_*D>qR#>Wlv|^-t8W
zFZO;GR|y*Q%}u;i_Xe{qk#$^UW12M-JN?KxogV%^_&EGr;iRh1i~6EIKfQUls?~lq
yE}FgF$;F%3Kfb>EdGZzo=FFZw-7m+*!QQQ{%TMnwkB|D7oCo3YqbDDJRrm+Mhpv$T

diff --git a/src/main/java/a8k/dbservice/AppUsrDBService.java b/src/main/java/a8k/dbservice/AppUsrDBService.java
index 72d8b7c..c10cf82 100644
--- a/src/main/java/a8k/dbservice/AppUsrDBService.java
+++ b/src/main/java/a8k/dbservice/AppUsrDBService.java
@@ -73,13 +73,19 @@ public class AppUsrDBService {
 	}
 
 	public AppUser getUsrByAccount(String account) {
-		return jdbcTemplate.queryForObject("select * from zapp_usr_table where account = ?;", this::rowMapper,//
-				account);
+		try {
+			return jdbcTemplate.queryForObject("select * from zapp_usr_table where account = ?;", this::rowMapper, account);
+		} catch (Exception e) {
+			return null;
+		}
 	}
 
 	public AppUser getUsrById(Integer id) {
-		return jdbcTemplate.queryForObject("select * from zapp_usr_table where id = ?;", this::rowMapper,//
-				id);
+		try {
+			return jdbcTemplate.queryForObject("select * from zapp_usr_table where id = ?;", this::rowMapper, id);
+		} catch (Exception e) {
+			return null;
+		}
 	}
 
 }
diff --git a/src/main/java/a8k/dbservice/type/AppUser.java b/src/main/java/a8k/dbservice/type/AppUser.java
index cd8684f..8a9adc3 100644
--- a/src/main/java/a8k/dbservice/type/AppUser.java
+++ b/src/main/java/a8k/dbservice/type/AppUser.java
@@ -3,11 +3,11 @@ package a8k.dbservice.type;
 import a8k.utils.ZJsonHelper;
 
 public class AppUser {
-	public int     id = -1;
+	public int     id = 0;
 	public String  account;
 	public String  password;
 	public UsrRole usrRole;
-	public Boolean isBuiltInUser;
+	public Boolean isBuiltInUser = false;
 
 	@Override
 	public String toString() {
diff --git a/src/main/java/a8k/service/app/AppUserMgrService.java b/src/main/java/a8k/service/app/AppUserMgrService.java
index dff1eb4..b772577 100644
--- a/src/main/java/a8k/service/app/AppUserMgrService.java
+++ b/src/main/java/a8k/service/app/AppUserMgrService.java
@@ -30,6 +30,7 @@ public class AppUserMgrService {
 		static final int modifyUser    = 7;
 		static final int modifyUsrPwd  = 8;
 		static final int modifyUsrRole = 9;
+		static final int modifyUsrAccount = 10;
 	}
 
 	@Resource
@@ -88,38 +89,35 @@ public class AppUserMgrService {
 		return getUsrlist();
 	}
 
-	@ExtApiFn(name = "修改用户", order = ORDER.modifyUser)
-	public AppRet<List<AppUser>> modifyUser(Integer id, String account, String password, UsrRole usrRole) {
-		var user = appUsrDBService.getUsrById(id);
+	@ExtApiFn(name = "修改用户密码", order = ORDER.modifyUsrPwd)
+	public AppRet<List<AppUser>> modifyUsrPwd(String account, String password) {
+		var user = appUsrDBService.getUsrByAccount(account);
 		if (user == null) {
 			return AppRet.fail(A8kEcode.UsrNotExitError);
 		}
-		user.account  = account;
 		user.password = password;
-		user.usrRole  = usrRole;
 		appUsrDBService.updateUser(user);
 		return getUsrlist();
 	}
 
-
-	@ExtApiFn(name = "修改用户密码", order = ORDER.modifyUsrPwd)
-	public AppRet<List<AppUser>> modifyUsrPwd(String account, String password) {
+	@ExtApiFn(name = "修改用户权限", order = ORDER.modifyUsrRole)
+	public AppRet<List<AppUser>> modifyUsrRole(String account, UsrRole usrRole) {
 		var user = appUsrDBService.getUsrByAccount(account);
 		if (user == null) {
 			return AppRet.fail(A8kEcode.UsrNotExitError);
 		}
-		user.password = password;
+		user.usrRole = usrRole;
 		appUsrDBService.updateUser(user);
 		return getUsrlist();
 	}
 
-	@ExtApiFn(name = "修改用户权限", order = ORDER.modifyUsrRole)
-	public AppRet<List<AppUser>> modifyUsrRole(String account, UsrRole usrRole) {
+	@ExtApiFn(name = "修改用户名称", order = ORDER.modifyUsrAccount)
+	public AppRet<List<AppUser>> modifyUsrAccount(String account, String newaccount) {
 		var user = appUsrDBService.getUsrByAccount(account);
 		if (user == null) {
 			return AppRet.fail(A8kEcode.UsrNotExitError);
 		}
-		user.usrRole = usrRole;
+		user.account = newaccount;
 		appUsrDBService.updateUser(user);
 		return getUsrlist();
 	}