``修复

src/main/java/org/springblade/bank/cardswallow/controller/CardSwallowController.java

@@ -121,7 +121,7 @@ public class CardSwallowController extends BladeController {
 //		deptChildIds.add(deptId);
 		Dept dept = deptService.getById(deptId);
 		Dept parentDept = deptService.getById(dept.getParentId());
-		if (parentDept.getOrgNo().startsWith("999")){
+		if (parentDept != null && parentDept.getOrgNo().startsWith("999")){
 			deptChildIds.add(parentDept.getId());
 		}
 		cardSwallow.setDeptIdList(deptChildIds);
@@ -437,7 +437,7 @@ public class CardSwallowController extends BladeController {
 //		deptChildIds.add(deptId);
 		Dept dept = deptService.getById(deptId);
 		Dept parentDept = deptService.getById(dept.getParentId());
-		if (parentDept.getOrgNo().startsWith("999")){
+		if (parentDept != null && parentDept.getOrgNo().startsWith("999")){
 			deptChildIds.add(parentDept.getId());
 		}
 		cardSwallow.setDeptIdList(deptChildIds);

src/main/java/org/springblade/bank/keypwd/controller/KeyPwdController.java

@@ -115,7 +115,7 @@ public class KeyPwdController extends BladeController {
 //		deptChildIds.add(deptId);
 		Dept dept = deptService.getById(deptId);
 		Dept parentDept = deptService.getById(dept.getParentId());
-		if (parentDept.getOrgNo().startsWith("999")){
+		if (parentDept != null && parentDept.getOrgNo().startsWith("999")){
 			deptChildIds.add(parentDept.getId());
 		}
 		keyPwd.setDeptIdList(deptChildIds);
@@ -146,7 +146,7 @@ public class KeyPwdController extends BladeController {
 //		deptChildIds.add(deptId);
 		Dept dept = deptService.getById(deptId);
 		Dept parentDept = deptService.getById(dept.getParentId());
-		if (parentDept.getOrgNo().startsWith("999")){
+		if (parentDept != null && parentDept.getOrgNo().startsWith("999")){
 			deptChildIds.add(parentDept.getId());
 		}
 		keyPwd.setDeptIdList(deptChildIds);
@@ -283,6 +283,10 @@ public class KeyPwdController extends BladeController {
 		UserLog userLog = new UserLog();
 		Assert.isTrue(!keyPwd.getHandoverPersonNo().equals(keyPwd.getReceiverNo()), "交出人不可為接收人！請重新選擇！");
 
+		KeyPwd one = keyPwdService.getOne(new QueryWrapper<>(new KeyPwd()).lambda().eq(KeyPwd::getBankNo, keyPwd.getBankNo()).eq(KeyPwd::getOrgNo, keyPwd.getOrgNo())
+			.eq(KeyPwd::getCategory, keyPwd.getCategory()).eq(KeyPwd::getStatus, 1).eq(KeyPwd::getProcess, 2));
+		Assert.isNull(one, "該分類種類已在待確認中，請勿重新發起！");
+
 		KeyPwd old = null;
 		if (isAdd){
 			keyPwd.setFillingPerson(user.getName());
@@ -400,7 +404,7 @@ public class KeyPwdController extends BladeController {
 //		deptChildIds.add(deptId);
 		Dept dept = deptService.getById(deptId);
 		Dept parentDept = deptService.getById(dept.getParentId());
-		if (parentDept.getOrgNo().startsWith("999")){
+		if (parentDept != null && parentDept.getOrgNo().startsWith("999")){
 			deptChildIds.add(parentDept.getId());
 		}
 		keyPwd.setDeptIdList(deptChildIds);

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

@@ -401,7 +401,7 @@ public class ReturnsController extends BladeController {
 		Assert.notNull(dept, "找不到該機構名稱【" + returns.getSubBank() + "】對應的機構！");
 		returns.setCreateDept(dept.getId());
 
-		/*returns.setProcess(4);
+		returns.setProcess(4);
 		returns.setIsCompleted(1);
 		returns.setBankConfirmName(user.getName());
 		returns.setBankConfirmNo(user.getEhr());
@@ -423,7 +423,7 @@ public class ReturnsController extends BladeController {
 			userLog.setPersonName(user.getName());
 			userLog.setOperationType("approve");
 			userLogService.save(userLog);
-		}*/
+		}
 		return R.status(true);
 	}
 
@@ -468,7 +468,7 @@ public class ReturnsController extends BladeController {
 //		deptChildIds.add(deptId);
 		Dept dept = deptService.getById(deptId);
 		Dept parentDept = deptService.getById(dept.getParentId());
-		if (parentDept.getOrgNo().startsWith("999")){
+		if (parentDept != null && parentDept.getOrgNo().startsWith("999")){
 			deptChildIds.add(parentDept.getId());
 		}
 		returns.setDeptIdList(deptChildIds);

src/main/java/org/springblade/bank/sealhandover/controller/SealHandoverController.java

@@ -112,7 +112,7 @@ public class SealHandoverController extends BladeController {
 //		deptChildIds.add(deptId);
 		Dept dept = deptService.getById(deptId);
 		Dept parentDept = deptService.getById(dept.getParentId());
-		if (parentDept.getOrgNo().startsWith("999")){
+		if (parentDept != null && parentDept.getOrgNo().startsWith("999")){
 			deptChildIds.add(parentDept.getId());
 		}
 
@@ -145,7 +145,7 @@ public class SealHandoverController extends BladeController {
 //		deptChildIds.add(deptId);
 		Dept dept = deptService.getById(deptId);
 		Dept parentDept = deptService.getById(dept.getParentId());
-		if (parentDept.getOrgNo().startsWith("999")){
+		if (parentDept != null && parentDept.getOrgNo().startsWith("999")){
 			deptChildIds.add(parentDept.getId());
 		}
 		sealHandover.setDeptIdList(deptChildIds);
@@ -207,7 +207,7 @@ public class SealHandoverController extends BladeController {
 //		deptChildIds.add(deptId);
 		Dept dept = deptService.getById(deptId);
 		Dept parentDept = deptService.getById(dept.getParentId());
-		if (parentDept.getOrgNo().startsWith("999")){
+		if (parentDept != null && parentDept.getOrgNo().startsWith("999")){
 			deptChildIds.add(parentDept.getId());
 		}
 

src/main/java/org/springblade/modules/desk/service/impl/NoticeServiceImpl.java

@@ -341,7 +341,7 @@ public class NoticeServiceImpl extends BaseServiceImpl<NoticeMapper, Notice> imp
 	public boolean sendChecklistNotice(String cycle, Dept dept) {
 		List<String> deptIds = new ArrayList<>();
 		Dept parentDept = deptService.getById(dept.getParentId());
-		if (parentDept.getOrgNo().startsWith("999")){
+		if (parentDept != null && parentDept.getOrgNo().startsWith("999")){
 			deptIds.add(parentDept.getId() + "");
 		}
 		deptIds.add(dept.getId() + "");