--no commit message

app/sysuser/src/main/java/com/zrqx/sysuser/bg/controller/dept/DepartmentController.java

@@ -45,31 +45,38 @@ public class DepartmentController {
 	@Autowired
 	private ModulepowerService modulepowerSerivce;
 	
-	@ApiOperation(value = "新增部门" , notes ="新增一个部门")
+	@ApiOperation(value = "新增或修改部门" , notes ="新增或修改一个部门")
 	@PostMapping(value = "/save")
 	public CallBack<Boolean> save(@RequestBody Department entity){
-		//分页排序查询当前子分类最大code值
-		Example example = departmentSerivce.createExample();
-		example.createCriteria().andEqualTo("parentId", entity.getParentId());
-		PageParam pageParam = new PageParam();
-		pageParam.setPageSize(1);
-		pageParam.setOrderBy("code desc");
-		PageInfo<Department> page = departmentSerivce.queryExample(pageParam,example);
-		if(page.getList() != null && page.getList().size() > 0){
-			//查询到子分类，获取最大code生成新的code
-			String code = page.getList().get(0).getCode();
-			entity.setCode(UUIDUtil.newCode(code));
-		}else{
-			//没有查询到子分类，获取父类code 拼接 01
-			if(entity.getParentId()!=0){
-				entity.setCode(departmentSerivce.selectByPrimaryKey(entity.getParentId()).getCode()+ "01");
+		if(entity.getId() == null){
+			//分页排序查询当前子分类最大code值
+			Example example = departmentSerivce.createExample();
+			example.createCriteria().andEqualTo("parentId", entity.getParentId());
+			PageParam pageParam = new PageParam();
+			pageParam.setPageSize(1);
+			pageParam.setOrderBy("code desc");
+			PageInfo<Department> page = departmentSerivce.queryExample(pageParam,example);
+			if(page.getList() != null && page.getList().size() > 0){
+				//查询到子分类，获取最大code生成新的code
+				String code = page.getList().get(0).getCode();
+				entity.setCode(UUIDUtil.newCode(code));
 			}else{
-				entity.setCode("01");
+				//没有查询到子分类，获取父类code 拼接 01
+				if(entity.getParentId()!=0){
+					entity.setCode(departmentSerivce.selectByPrimaryKey(entity.getParentId()).getCode()+ "01");
+				}else{
+					entity.setCode("01");
+				}
+			}
+			entity.setCreateTime(new Date());
+			if(!departmentSerivce.insert(entity)){
+				throw new BaseException("操作失败");
+			}
+		} else {
+			entity.setUpdateTime(new Date());
+			if(!departmentSerivce.updateByPrimaryKeySelective(entity)){
+				throw new BaseException("操作失败");
 			}
-		}
-		entity.setCreateTime(new Date());
-		if(!departmentSerivce.insert(entity)){
-			throw new BaseException("操作失败");
 		}
 		// 更新权限
 		ModulepowerToDepartmentForm f = new ModulepowerToDepartmentForm();
@@ -79,24 +86,6 @@ public class DepartmentController {
 		return CallBack.success(true);
 	}
 	
-	@ApiOperation(value = "更新部门" , notes ="根据部门ID更新一个部门,空值默认不更新")
-	@PostMapping(value = "/update")
-	public CallBack<Boolean> update(@RequestBody SaveOrUpdateDepartmentForm form){
-		Department department = new Department();
-		department.setId(form.getId());
-		department.setDepartmentName(form.getDepartmentName());
-		department.setIntro(form.getIntro());
-		department.setUpdateTime(new Date());
-		if(departmentSerivce.updateByPrimaryKeySelective(department)){
-			// 更新权限
-			ModulepowerToDepartmentForm f = new ModulepowerToDepartmentForm();
-			f.setDepartmentId(form.getId());
-			f.setMpIdList(form.getMpIdList());
-			departmentSerivce.saveModulepowerToDepartment(f);
-		}
-		return CallBack.success();
-	}
-	
 	@ApiOperation(value = "删除部门" , notes ="根据部门code删除一个部门")
 	@PostMapping(value = "/delete")
 	public CallBack<Boolean> delete(@RequestBody String[] codeList){