Merge branch 'develop-czg' into develop

# Conflicts:
#	src/main/java/cn/timer/api/controller/zzgl/ZzglController.java

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

@@ -332,7 +332,7 @@ public class ZzglController {
 			zzglBmgwM.setUpId(0);
 			zzglBmgwM.setUpId(0);
 		}
 		}
 		ZzglBmgwM bmgwM = zzglBmgwMMapper.selectById(zzglBmgwM.getUpId());
 		ZzglBmgwM bmgwM = zzglBmgwMMapper.selectById(zzglBmgwM.getUpId());
-		if(bmgwM.getType() ==1){
+		if(bmgwM.getType() !=1){
 			return ResultUtil.error("部门名称上级不能为岗位");
 			return ResultUtil.error("部门名称上级不能为岗位");
 		}
 		}
 
 
@@ -354,8 +354,8 @@ public class ZzglController {
 	 * @return
 	 * @return
 	 */
 	 */
 	@PostMapping(value = "/job")
 	@PostMapping(value = "/job")
-	@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> addjob
 	public Result<ZzglBmgwM> addjob
 	(@CurrentUser UserBean userBean, @RequestBody ZzglBmgwM zzglBmgwM) {
 	(@CurrentUser UserBean userBean, @RequestBody ZzglBmgwM zzglBmgwM) {
 
 
@@ -399,6 +399,7 @@ public class ZzglController {
 	/**
 	/**
 	 * 批量修改/删除员工部门
 	 * 批量修改/删除员工部门
 	 * 
 	 * 
+	 * @param 部门岗位id
 	 * @return
 	 * @return
 	 */
 	 */
 	@PostMapping(value = "/empdept")
 	@PostMapping(value = "/empdept")
@@ -406,10 +407,6 @@ public class ZzglController {
 	public Result<Void> updatelistempdept(@CurrentUser UserBean userBean, @RequestBody UpEmpDeptDto upEmpDeptDto) {
 	public Result<Void> updatelistempdept(@CurrentUser UserBean userBean, @RequestBody UpEmpDeptDto upEmpDeptDto) {
 		Integer dpetId = upEmpDeptDto.getDpetId();
 		Integer dpetId = upEmpDeptDto.getDpetId();
 		List<Integer> empNums = upEmpDeptDto.getEmpNum();
 		List<Integer> empNums = upEmpDeptDto.getEmpNum();
-		ZzglBmgwM bmgwM = zzglBmgwMMapper.selectById(dpetId);
-		if(bmgwM.getType() !=1){
-			return ResultUtil.error("不能在公司或者部门下新增岗位成员");
-		}
 		YgglMainEmp ygglMainEmp = YgglMainEmp.builder().build();
 		YgglMainEmp ygglMainEmp = YgglMainEmp.builder().build();
 		zzglLogDgjlMapper.insertbyaddemp(empNums, userBean.getEmpNum(), dpetId, userBean.getOrgCode(),
 		zzglLogDgjlMapper.insertbyaddemp(empNums, userBean.getEmpNum(), dpetId, userBean.getOrgCode(),
 				dpetId == null || dpetId == 0 ? "岗位删除员工" : upEmpDeptDto.getIsdg() == null ? "岗位添加员工" : "员工调岗");
 				dpetId == null || dpetId == 0 ? "岗位删除员工" : upEmpDeptDto.getIsdg() == null ? "岗位添加员工" : "员工调岗");