```新開戶退件-更改為機構名稱匹配

src/main/java/org/springblade/bank/postchange/controller/PostChangeController.java

@@ -126,8 +126,10 @@ public class PostChangeController extends BladeController {
 			PostChange item = records.get(i);
 			User user = userService.getById(item.getCreateUser());
 			PostChangeVO postChangeVO = Objects.requireNonNull(BeanUtil.copy(item, PostChangeVO.class));
-			postChangeVO.setCreateUserName(user.getName());
-			postChangeVO.setCreateUserNo(user.getEhr());
+			if (user != null){
+				postChangeVO.setCreateUserName(user.getName());
+				postChangeVO.setCreateUserNo(user.getEhr());
+			}
 			list.add(postChangeVO);
 		}
 

src/main/java/org/springblade/bank/returns/controller/ReturnsController.java

@@ -277,8 +277,8 @@ public class ReturnsController extends BladeController {
 	@ApiOperation(value = "", notes = "")
 	public R returnsSubmit(@Valid @RequestBody Returns returns) {
 
-		Dept subDept = deptService.getOne(new QueryWrapper<>(new Dept()).lambda().eq(Dept::getOrgNo, returns.getSubOrgNo()));
-		Assert.notNull(subDept, "找不到該機構號【" + returns.getSubOrgNo() + "】對應的機構！");
+		Dept subDept = deptService.getOne(new QueryWrapper<>(new Dept()).lambda().eq(Dept::getDeptName, returns.getSubBank()));
+		Assert.notNull(subDept, "找不到該機構名稱【" + returns.getSubBank() + "】對應的機構！");
 
 		String roleId = AuthUtil.getUser().getRoleId();
 		List<User> usersByDeptIdsRoleIds = userService.getUsersByDeptIdsRoleIds(null, Func.toStrList(roleId));
@@ -360,8 +360,8 @@ public class ReturnsController extends BladeController {
 	public R issue(@Valid @RequestBody Returns returns) {
 
 		returns.setProcess(3);
-		Dept dept = deptService.getOne(new QueryWrapper<>(new Dept()).lambda().eq(Dept::getOrgNo, returns.getSubOrgNo()));
-		Assert.notNull(dept, "找不到該機構號【" + returns.getSubOrgNo() + "】對應的機構！");
+		Dept dept = deptService.getOne(new QueryWrapper<>(new Dept()).lambda().eq(Dept::getDeptName, returns.getSubBank()));
+		Assert.notNull(dept, "找不到該機構名稱【" + returns.getSubBank() + "】對應的機構！");
 		returns.setCreateDept(dept.getId());
 
 		if (returnsService.saveOrUpdate(returns)){
@@ -397,8 +397,8 @@ public class ReturnsController extends BladeController {
 	@ApiOperation(value = "", notes = "")
 	public R returnsApprove(@Valid @RequestBody Returns returns) {
 		User user = userService.getById(AuthUtil.getUserId());
-		Dept dept = deptService.getOne(new QueryWrapper<>(new Dept()).lambda().eq(Dept::getOrgNo, returns.getSubOrgNo()));
-		Assert.notNull(dept, "找不到該機構號【" + returns.getSubOrgNo() + "】對應的機構！");
+		Dept dept = deptService.getOne(new QueryWrapper<>(new Dept()).lambda().eq(Dept::getDeptName, returns.getSubBank()));
+		Assert.notNull(dept, "找不到該機構名稱【" + returns.getSubBank() + "】對應的機構！");
 		returns.setCreateDept(dept.getId());
 
 		/*returns.setProcess(4);