--no commit message

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

@@ -19,12 +19,14 @@ import com.zrqx.core.util.page.PageParam;
 import com.zrqx.core.util.response.CallBack;
 import com.zrqx.sysuser.bg.service.dept.DepartmentService;
 import com.zrqx.sysuser.commons.form.bg.dept.ModulepowerToDepartmentForm;
+import com.zrqx.sysuser.commons.form.bg.dept.QueryDepartmentForm;
 import com.zrqx.sysuser.commons.model.dept.Department;
 import com.zrqx.sysuser.commons.vo.bg.dept.DepartmentVO;
 
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import tk.mybatis.mapper.entity.Example;
+import tk.mybatis.mapper.entity.Example.Criteria;
 /**
  * 部门 Controller
  */
@@ -110,4 +112,17 @@ public class DepartmentController {
 	public CallBack<Boolean> saveModulepowerToDepartment(@RequestBody ModulepowerToDepartmentForm form){
 		return CallBack.success(departmentSerivce.saveModulepowerToDepartment(form));
 	}
+	
+	@ApiOperation(value = "查询 一级部门 名称是否存在", notes = "查询 一级部门 名称是否存在接口")
+	@GetMapping(value = "/isExist/name")
+	public CallBack<Boolean> isExistNameBoolean(QueryDepartmentForm form) {
+		Example example = departmentSerivce.createExample();
+		Criteria cr = example.createCriteria();
+		cr.andEqualTo("departmentName", form.getDepartmentName());
+		cr.andEqualTo("parentId", 0);
+		if(form.getId() != null){
+			cr.andNotEqualTo("id", form.getId());
+		}
+		return CallBack.success(departmentSerivce.selectOneByExample(example) != null);
+	}
 }

app/sysuser/src/main/java/com/zrqx/sysuser/bg/controller/role/RoleController.java

@@ -16,11 +16,14 @@ import com.zrqx.core.util.page.PageInfo;
 import com.zrqx.core.util.page.PageParam;
 import com.zrqx.core.util.response.CallBack;
 import com.zrqx.sysuser.bg.service.role.RoleService;
+import com.zrqx.sysuser.commons.form.bg.role.QueryRoleForm;
 import com.zrqx.sysuser.commons.form.bg.role.SaveRoleForm;
 import com.zrqx.sysuser.commons.vo.bg.role.RoleVO;
 
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
+import tk.mybatis.mapper.entity.Example;
+import tk.mybatis.mapper.entity.Example.Criteria;
 
 /**
  * 角色Controller
@@ -68,6 +71,16 @@ public class RoleController {
 		return roleService.batchDelete(ids) ? CallBack.success(true) : CallBack.fail();
 	}
 	
-	
+	@ApiOperation(value = "查询 角色 名称是否存在", notes = "查询 角色 名称是否存在接口")
+	@GetMapping(value = "/isExist/name")
+	public CallBack<Boolean> isExistNameBoolean(QueryRoleForm form) {
+		Example example = roleService.createExample();
+		Criteria cr = example.createCriteria();
+		cr.andEqualTo("name", form.getName());
+		if(form.getId() != null){
+			cr.andNotEqualTo("id", form.getId());
+		}
+		return CallBack.success(roleService.selectOneByExample(example) != null);
+	}
 	
 }

app/sysuser/src/main/java/com/zrqx/sysuser/commons/form/bg/dept/QueryDepartmentForm.java

+package com.zrqx.sysuser.commons.form.bg.dept;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+@Data
+public class QueryDepartmentForm {
+	@ApiModelProperty("部门id，新增时不需要填写")
+	private Integer id;
+	@ApiModelProperty(value = "父级部门id")
+	private Integer parentId;
+	@ApiModelProperty(value = "部门名称" , required = true)
+	private String departmentName;
+}

app/sysuser/src/main/java/com/zrqx/sysuser/commons/form/bg/role/QueryRoleForm.java

+package com.zrqx.sysuser.commons.form.bg.role;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+@Data
+public class QueryRoleForm {
+	@ApiModelProperty(value = "角色id")
+	private Integer id;
+	@ApiModelProperty(value = "角色名", required = true)
+	private String name;
+}