Bladeren bron

修復用户查询方法,增加判空

fangq 4 jaren geleden
bovenliggende
commit
73eb1c5692

+ 1 - 1
src/main/java/org/springblade/bank/keypwd/controller/KeyPwdController.java

@@ -275,7 +275,7 @@ public class KeyPwdController extends BladeController {
 
 		KeyPwd old = null;
 		if (isAdd){
-			keyPwd.setFillingPerson(currentUser.getUserName());
+			keyPwd.setFillingPerson(currentUser.getNickName());
 			keyPwd.setFillingDate(DateUtil.now());
 		}else{
 			old = keyPwdService.getById(keyPwd.getId());

+ 1 - 1
src/main/java/org/springblade/bank/keypwd/service/impl/KeyPwdServiceImpl.java

@@ -111,7 +111,7 @@ public class KeyPwdServiceImpl extends BaseServiceImpl<KeyPwdMapper, KeyPwd> imp
 			keep.setHandoverPersonId(keyPwd.getHandoverPersonId());
 			keep.setHandoverPersonNo(keyPwd.getHandoverPersonNo());
 			keep.setHandoverPersonName(keyPwd.getHandoverPersonName());
-			keep.setFillingPerson(keyPwd.getHandoverPersonNo());
+			keep.setFillingPerson(keyPwd.getHandoverPersonName());
 			keep.setFillingDate(DateUtil.now());
 			keep.setCreateUser(AuthUtil.getUserId());
 			keep.setCreateTime(keyPwd.getCreateTime());

+ 2 - 2
src/main/java/org/springblade/bank/sealhandover/controller/SealHandoverController.java

@@ -292,7 +292,7 @@ public class SealHandoverController extends BladeController {
 				keep.setHandoverPersonNo(sealHandover.getHandoverPersonNo());
 				keep.setHandoverPersonName(sealHandover.getHandoverPersonName());
 				keep.setRemark(sealHandover.getRemark());
-				keep.setFillingPerson(sealHandover.getHandoverPersonNo());
+				keep.setFillingPerson(sealHandover.getHandoverPersonName());
 				keep.setFillingDate(sealHandover.getFillingDate());
 				keep.setCreateUser(sealHandover.getCreateUser());
 				keep.setCreateTime(sealHandover.getCreateTime());
@@ -355,7 +355,7 @@ public class SealHandoverController extends BladeController {
 		SealHandover old = null;
 		if (isAdd){
 			sealHandover.setProcess(2);
-			sealHandover.setFillingPerson(currentUser.getUserName());
+			sealHandover.setFillingPerson(currentUser.getNickName());
 			sealHandover.setFillingDate(DateUtil.now());
 
 			//判断该机构下此印章是否有待确认记录

+ 1 - 1
src/main/java/org/springblade/bank/tellertrunk/controller/TellerTrunkController.java

@@ -145,7 +145,7 @@ public class TellerTrunkController extends BladeController {
 
 		TellerTrunk old = null;
 		if (isAdd){
-			tellerTrunk.setFillingPerson(currentUser.getUserName());
+			tellerTrunk.setFillingPerson(currentUser.getNickName());
 			tellerTrunk.setFillingDate(DateUtil.now());
 		}else{
 			old = tellerTrunkService.getById(tellerTrunk.getId());

+ 1 - 1
src/main/java/org/springblade/bank/warehouse/controller/CheckWarehouseController.java

@@ -145,7 +145,7 @@ public class CheckWarehouseController extends BladeController {
 
 		CheckWarehouse old = null;
 		if (isAdd){
-			checkWarehouse.setFillingPerson(currentUser.getUserName());
+			checkWarehouse.setFillingPerson(currentUser.getNickName());
 			checkWarehouse.setFillingDate(DateUtil.now());
 		}else{
 			old = checkWarehouseService.getById(checkWarehouse.getId());