更新部门下不能设置职位

a6005e45 · Your Name · 8446afb7 · a6005e45
Commit a6005e45 authored May 07, 2021 by Your Name
Hide whitespace changes
Inline Side-by-side

Showing with 4 additions and 3 deletions

src/main/java/cn/timer/api/controller/zzgl/ZzglController.java
+4 -3

No files found.
--- a/src/main/java/cn/timer/api/controller/zzgl/ZzglController.java
+++ b/src/main/java/cn/timer/api/controller/zzgl/ZzglController.java
@@ -332,10 +332,11 @@ public class ZzglController {
 			zzglBmgwM.setUpId(0);
 		}
 		ZzglBmgwM bmgwM = zzglBmgwMMapper.selectById(zzglBmgwM.getUpId());
-		if(bmgwM.getType() !=1){
+		if(bmgwM !=null) {
-			return ResultUtil.error("部门名称上级不能为岗位");
+			if (bmgwM.getType() != 1) {
+				return ResultUtil.error("部门名称上级不能为岗位");
+			}
 		}
 		if (zzglBmgwM.getLeader() == null && StrUtil.length(StrUtil.trim(zzglBmgwM.getName())) == 0) 
 			return ResultUtil.error("部门名称不能为空");