--no commit message

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

@@ -6,6 +6,7 @@ import java.util.List;
 
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PathVariable;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
@@ -21,6 +22,7 @@ import com.zrqx.sysuser.bg.service.dept.DepartmentService;
 import com.zrqx.sysuser.commons.form.bg.dept.ModulepowerToDepartmentForm;
 import com.zrqx.sysuser.commons.model.dept.Department;
 import com.zrqx.sysuser.commons.vo.bg.dept.DepartmentVO;
+import com.zrqx.sysuser.commons.vo.bg.dept.DeptDetailVO;
 
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
@@ -110,4 +112,11 @@ public class DepartmentController {
 	public CallBack<Boolean> saveModulepowerToDepartment(@RequestBody ModulepowerToDepartmentForm form){
 		return CallBack.success(departmentSerivce.saveModulepowerToDepartment(form));
 	}
+	
+	@ApiOperation(value = "部门绑定的模块" , notes ="部门绑定的模块")
+	@GetMapping(value = "/get/oid")
+	public CallBack<DeptDetailVO> getById(@PathVariable Integer id){
+		return CallBack.success(departmentSerivce.getById(id));
+	}
+	
 }

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

@@ -19,6 +19,8 @@ import com.zrqx.core.util.response.CallBack;
 import com.zrqx.sysuser.bg.service.role.RoleService;
 import com.zrqx.sysuser.commons.form.bg.role.SaveRoleOperatepowerForm;
 import com.zrqx.sysuser.commons.model.role.Role;
+import com.zrqx.sysuser.commons.vo.bg.dept.DeptDetailVO;
+import com.zrqx.sysuser.commons.vo.bg.role.RoleDetailVO;
 
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
@@ -66,8 +68,8 @@ public class RoleController {
 	}
 	@ApiOperation(value = "查询", notes = "根据ID查询")
 	@GetMapping(value = "/{oid}")
-	public CallBack<Role> getById(@PathVariable Integer oid) {
-		return CallBack.success(roleService.selectByPrimaryKey(oid));
+	public CallBack<RoleDetailVO> getById(@PathVariable Integer oid) {
+		return CallBack.success(roleService.getById(oid));
 	}
 	@ApiOperation(value = "查询角色" , notes ="查询角色")
 	@GetMapping(value = "/page")
@@ -96,4 +98,6 @@ public class RoleController {
 		}
 		return CallBack.success(roleService.selectOneByExample(example) != null);
 	}
+	
+	
 }

app/sysuser/src/main/java/com/zrqx/sysuser/bg/mapper/dept/DepartmentPowerrelationMapper.java

@@ -52,4 +52,8 @@ public interface DepartmentPowerrelationMapper extends BaseMapper<DepartmentPowe
 			+ " eq(d.departmentId,departmentId) "
 			+ "</script>")
 	List<Integer> getMPIDListByDeptId(@Param("departmentId")Integer departmentId);
+	
+	
+	@Select("select mpId  from sys_department_module_power where departmentId = #{id}")
+	List<Integer> queryList(@Param("id")Integer id);
 }

app/sysuser/src/main/java/com/zrqx/sysuser/bg/mapper/role/RolePowerrelationMapper.java

@@ -5,6 +5,7 @@ import java.util.List;
 import org.apache.ibatis.annotations.Delete;
 import org.apache.ibatis.annotations.Insert;
 import org.apache.ibatis.annotations.Param;
+import org.apache.ibatis.annotations.Select;
 
 import com.zrqx.core.mapper.BaseMapper;
 import com.zrqx.sysuser.commons.model.role.RolePowerrelation;
@@ -35,4 +36,8 @@ public interface RolePowerrelationMapper extends BaseMapper<RolePowerrelation>{
 	@Delete("delete from sys_role_operate_power where roleId = #{roleId}")
 	int deleteOperatepowerToRole(Integer roleId);
 	
+	
+	@Select("select opId from sys_role_operate_power where roleId = #{id}")
+	List<Integer> queryList(Integer id);
+	
 }

app/sysuser/src/main/java/com/zrqx/sysuser/bg/service/dept/DepartmentService.java

@@ -2,9 +2,12 @@ package com.zrqx.sysuser.bg.service.dept;
 
 import java.util.List;
 
+import org.springframework.web.bind.annotation.PathVariable;
+
 import com.zrqx.core.service.BaseService;
 import com.zrqx.sysuser.commons.form.bg.dept.ModulepowerToDepartmentForm;
 import com.zrqx.sysuser.commons.model.dept.Department;
+import com.zrqx.sysuser.commons.vo.bg.dept.DeptDetailVO;
 /**
  * 部门
  */
@@ -12,4 +15,13 @@ public interface DepartmentService extends BaseService<Department,Integer>{
 	boolean saveModulepowerToDepartment(ModulepowerToDepartmentForm form);
 	
 	List<Integer> getMPListByDeptId(Integer deptId);
+	
+	 /**
+	  * 部门详情
+	 * @param id
+	 * @return
+	 * @author chyj
+	 * @date: 2020年5月9日 下午1:55:35
+	 */
+	DeptDetailVO getById(@PathVariable Integer id);
 }

app/sysuser/src/main/java/com/zrqx/sysuser/bg/service/dept/DepartmentServiceImpl.java

@@ -8,11 +8,13 @@ import org.springframework.stereotype.Service;
 
 import com.zrqx.core.mapper.BaseMapper;
 import com.zrqx.core.service.BaseServiceImpl;
+import com.zrqx.core.util.bean.BeanUtils;
 import com.zrqx.sysuser.bg.mapper.dept.DepartmentMapper;
 import com.zrqx.sysuser.bg.mapper.dept.DepartmentPowerrelationMapper;
 import com.zrqx.sysuser.commons.form.bg.dept.ModulepowerToDepartmentForm;
 import com.zrqx.sysuser.commons.model.dept.Department;
 import com.zrqx.sysuser.commons.model.dept.DepartmentPowerrelation;
+import com.zrqx.sysuser.commons.vo.bg.dept.DeptDetailVO;
 /**
  * 部门和模块关系
  */
@@ -50,8 +52,17 @@ public class DepartmentServiceImpl extends BaseServiceImpl<Department,Integer> i
 		List<Integer> mpidList = dpMapper.getMPIDListByDeptId(deptId);
 		return mpidList;
 	}
+	@Override
+	public DeptDetailVO getById(Integer id) {
+		Department department = departmentMapper.selectByPrimaryKey(id);
+		DeptDetailVO vo = BeanUtils.copy(department, DeptDetailVO.class);
+		//部门已绑定的模块
+		List<Integer> ids = dpMapper.queryList(id);
+		vo.setModuleIds(ids);
+		return vo;
+	}
 
 
-
+	
 
 }

app/sysuser/src/main/java/com/zrqx/sysuser/bg/service/role/RoleService.java

 package com.zrqx.sysuser.bg.service.role;
 
 
+import org.springframework.web.bind.annotation.PathVariable;
+
 import com.zrqx.core.service.BaseService;
 import com.zrqx.sysuser.commons.form.bg.role.SaveRoleOperatepowerForm;
 import com.zrqx.sysuser.commons.model.role.Role;
+import com.zrqx.sysuser.commons.vo.bg.role.RoleDetailVO;
 /**
  * 角色
  */
 public interface RoleService extends BaseService<Role,Integer>{
 	Boolean saveOperatepowerToRole(SaveRoleOperatepowerForm form);
+	
+	 /**
+	  * 角色详情
+	 * @param oid
+	 * @return
+	 * @author chyj
+	 * @date: 2020年5月9日 下午2:07:46
+	 */
+	RoleDetailVO getById(@PathVariable Integer oid);
 }

app/sysuser/src/main/java/com/zrqx/sysuser/bg/service/role/RoleServiceImpl.java

@@ -8,11 +8,13 @@ import org.springframework.stereotype.Service;
 
 import com.zrqx.core.mapper.BaseMapper;
 import com.zrqx.core.service.BaseServiceImpl;
+import com.zrqx.core.util.bean.BeanUtils;
 import com.zrqx.sysuser.bg.mapper.role.RoleMapper;
 import com.zrqx.sysuser.bg.mapper.role.RolePowerrelationMapper;
 import com.zrqx.sysuser.commons.form.bg.role.SaveRoleOperatepowerForm;
 import com.zrqx.sysuser.commons.model.role.Role;
 import com.zrqx.sysuser.commons.model.role.RolePowerrelation;
+import com.zrqx.sysuser.commons.vo.bg.role.RoleDetailVO;
 /**
  * 角色
  */
@@ -44,4 +46,20 @@ public class RoleServiceImpl extends BaseServiceImpl<Role,Integer> implements Ro
 		return roleMapper;
 	}
 
+
+
+	@Override
+	public RoleDetailVO getById(Integer oid) {
+		Role role = notNull(oid);
+		RoleDetailVO vo = BeanUtils.copy(role, RoleDetailVO.class);
+		//角色已绑定的按钮
+		List<Integer> operateIds = rolePowerrelationMapper.queryList(oid);
+		vo.setOpreatIds(operateIds);
+		return vo ;
+		
+	}
+	
+	
+	
+
 }

app/sysuser/src/main/java/com/zrqx/sysuser/commons/vo/bg/dept/DeptDetailVO.java

+package com.zrqx.sysuser.commons.vo.bg.dept;
+
+import java.util.List;
+
+import com.zrqx.sysuser.commons.model.dept.Department;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+@Data
+@ApiModel(value = "DeptDetailVO", description = "部门详情vo")
+public class DeptDetailVO extends Department{
+	
+	@ApiModelProperty("模块id集合")
+	private List<Integer> moduleIds;
+
+}

app/sysuser/src/main/java/com/zrqx/sysuser/commons/vo/bg/role/RoleDetailVO.java

+package com.zrqx.sysuser.commons.vo.bg.role;
+
+import java.util.List;
+
+import com.zrqx.sysuser.commons.model.role.Role;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+@Data
+@ApiModel(value = "RoleDetailVO", description = "角色详情vo")
+public class RoleDetailVO extends Role{
+	
+	@ApiModelProperty("按钮id集合")
+	private List<Integer> opreatIds;
+
+}