更新了岗位不能设置部门问题

src/main/java/cn/timer/api/controller/zzgl/ZzglController.java

@@ -321,8 +321,8 @@ public class ZzglController {
 	 * @return
 	 * @return
 	 */
 	 */
 	@PostMapping(value = "/dept")
 	@PostMapping(value = "/dept")
-	@ApiOperation(value = "添加/修改部门岗位", httpMethod = "POST", notes = "接口发布说明")
-	@Log(title = "添加/修改-部门岗位", businessType = BusinessType.INSERT_UPDATE)
+	@ApiOperation(value = "添加/修改部门", httpMethod = "POST", notes = "接口发布说明")
+	@Log(title = "添加/修改-部门", businessType = BusinessType.INSERT_UPDATE)
 	public Result<ZzglBmgwM> adddept(@CurrentUser UserBean userBean, @RequestBody ZzglBmgwM zzglBmgwM) {
 	public Result<ZzglBmgwM> adddept(@CurrentUser UserBean userBean, @RequestBody ZzglBmgwM zzglBmgwM) {
 		
 		
 		Integer count = zzglBmgwMMapper.selectCount(new QueryWrapper<ZzglBmgwM>().lambda()
 		Integer count = zzglBmgwMMapper.selectCount(new QueryWrapper<ZzglBmgwM>().lambda()
@@ -331,9 +331,13 @@ public class ZzglController {
 			// 根部门upId 默认为0
 			// 根部门upId 默认为0
 			zzglBmgwM.setUpId(0);
 			zzglBmgwM.setUpId(0);
 		}
 		}
+		ZzglBmgwM bmgwM = zzglBmgwMMapper.selectById(zzglBmgwM.getUpId());
+		if(bmgwM.getType() !=1){
+			return ResultUtil.error("部门名称上级不能为岗位");
+		}
 
 
 		if (zzglBmgwM.getLeader() == null && StrUtil.length(StrUtil.trim(zzglBmgwM.getName())) == 0) 
 		if (zzglBmgwM.getLeader() == null && StrUtil.length(StrUtil.trim(zzglBmgwM.getName())) == 0) 
-			return ResultUtil.error("部门岗位名称不能为空");
+			return ResultUtil.error("部门名称不能为空");
 		
 		
 		Boolean notId = zzglBmgwM.getId() == null;
 		Boolean notId = zzglBmgwM.getId() == null;
 		if (notId && zzglBmgwM.getType() == null)
 		if (notId && zzglBmgwM.getType() == null)
@@ -343,6 +347,32 @@ public class ZzglController {
 			
 			
 		return notId ? ResultUtil.data(zzglBmgwM) : ResultUtil.success();
 		return notId ? ResultUtil.data(zzglBmgwM) : ResultUtil.success();
 	}
 	}
+	/**
+	 * 添加/修改部门岗位
+	 *
+	 * @param
+	 * @return
+	 */
+	@PostMapping(value = "/job")
+	@ApiOperation(value = "添加/修改部门", httpMethod = "POST", notes = "接口发布说明")
+	@Log(title = "添加/修改-部门", businessType = BusinessType.INSERT_UPDATE)
+	public Result<ZzglBmgwM> addjob
+	(@CurrentUser UserBean userBean, @RequestBody ZzglBmgwM zzglBmgwM) {
+
+
+
+		if (zzglBmgwM.getLeader() == null && StrUtil.length(StrUtil.trim(zzglBmgwM.getName())) == 0)
+			return ResultUtil.error("岗位名称不能为空");
+
+		Boolean notId = zzglBmgwM.getId() == null;
+		if (notId && zzglBmgwM.getType() == null)
+			zzglBmgwM.setType((Integer) 1);
+		zzglBmgwM.setOrgCode(userBean.getOrgCode());
+		zzglBmgwM.insertOrUpdate();
+
+		return notId ? ResultUtil.data(zzglBmgwM) : ResultUtil.success();
+	}
+
 
 
 
 
 	/**
 	/**