BUG

blade-service/blade-business/src/main/java/org/springblade/business/controller/TreeContractFirstController.java

@@ -89,7 +89,7 @@ public class TreeContractFirstController extends BladeController {
 				}
 			}
 
-			if("0".equals(vos.getParentId())){
+			if("0".equals(vos.getParentId().toString())){
 				//根节点不删除
 				continue;
 			}

blade-service/blade-manager/src/main/java/org/springblade/manager/controller/SignPfxFileController.java

@@ -241,15 +241,18 @@ public class SignPfxFileController extends BladeController {
 					Iterator<SaveUserInfoByProjectDTO> iterator = contractUserList.iterator();
 					while (iterator.hasNext()){
 						SaveUserInfoByProjectDTO next = iterator.next();
-
-						if(next.getRoleId().equals(childVo.getId().toString())){
-							//角色相符
-							SignPfxFile userSignPfx = this.signPfxFileService.getOne(Wrappers.<SignPfxFile>lambdaQuery().eq(SignPfxFile::getCertificateUserId, next.getUserId()));
-							if(userSignPfx == null){
-								iterator.remove();
-								continue;
+						try{
+							if(next.getRoleId() != null && next.getRoleId().equals(childVo.getId().toString())){
+								//角色相符
+								SignPfxFile userSignPfx = this.signPfxFileService.getOne(Wrappers.<SignPfxFile>lambdaQuery().eq(SignPfxFile::getCertificateUserId, next.getUserId()));
+								if(userSignPfx == null){
+									iterator.remove();
+									continue;
+								}
+								childPfxUserVo.getSignPfxFileList().add(userSignPfx);
 							}
-							childPfxUserVo.getSignPfxFileList().add(userSignPfx);
+						}catch (Exception e){
+							e.printStackTrace();
 						}
 					}
 					//设置子集
@@ -277,7 +280,7 @@ public class SignPfxFileController extends BladeController {
 				while (iterator.hasNext()){
 					SaveUserInfoByProjectDTO next = iterator.next();
 
-					if(next.getRoleId().equals(adminVo.getRoleId().toString())){
+					if(next.getRoleId() != null && next.getRoleId().equals(adminVo.getRoleId().toString())){
 						//角色相符
 						SignPfxFile userSignPfx = this.signPfxFileService.getOne(Wrappers.<SignPfxFile>lambdaQuery().eq(SignPfxFile::getCertificateUserId, next.getUserId()));
 						if(userSignPfx == null){