--no commit message

app/sysuser/src/main/java/com/zrqx/sysuser/bg/controller/operatepower/BaseOperatepowerController.java

@@ -33,16 +33,11 @@ public class BaseOperatepowerController {
 	@Autowired
 	private BaseOperatepowerService service;
 
-	@ApiOperation(value = "添加")
+	@ApiOperation(value = "添加/修改")
 	@PostMapping("/save")
 	public CallBack<Boolean> save(@RequestBody BaseOperatepower form){
 		return CallBack.success(service.save(form));
 	}
-	@ApiOperation(value = "修改")
-	@PostMapping("/update")
-	public CallBack<Boolean> update(@RequestBody BaseOperatepower form){
-		return CallBack.success(service.update(form));
-	}
 	@ApiOperation(value = "批量删除")
 	@PostMapping("/batch/delete")
 	public CallBack<Boolean> batchDelete(@RequestBody List<Integer> ids){

app/sysuser/src/main/java/com/zrqx/sysuser/bg/controller/operatepower/OperatepowerController.java

@@ -46,18 +46,12 @@ public class OperatepowerController {
 	}
 	
 	
-	@ApiOperation(value = "新增按钮" , notes ="新增一个按钮")
+	@ApiOperation(value = "新增/修改  按钮" , notes ="新增/修改  按钮")
 	@PostMapping(value = "/save")
 	public CallBack<Boolean> save(@RequestBody Operatepower form){
 		return CallBack.success(operatepowerService.save(form));
 	}
 	
-	@ApiOperation(value = "修改按钮" , notes ="修改按钮")
-	@PostMapping(value = "/update")
-	public CallBack<Boolean> update(@RequestBody Operatepower form) throws Exception{
-		return CallBack.success(operatepowerService.update(form));
-	}
-	
 	@ApiOperation(value = "根据id查询", notes = "根据id查询")
 	@GetMapping(value = "/{oid}")
 	public CallBack<Operatepower> queryById(@PathVariable Integer oid) {

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

@@ -42,19 +42,12 @@ public class RoleController {
 		return CallBack.success(roleService.page(pageParam));
 	}
 	
-	@ApiOperation(value = "添加角色" , notes ="新增一个角色")
+	@ApiOperation(value = "添加/修改  角色" , notes ="添加/修改  角色")
 	@PostMapping(value = "/save")
 	public CallBack<Boolean> save(@RequestBody SaveRoleForm form){
 		return CallBack.success(roleService.save(form));
 	}
 	
-	@ApiOperation(value = "修改角色" , notes ="修改按钮")
-	@PostMapping(value = "/update")
-	public CallBack<Boolean> update(@RequestBody SaveRoleForm form) throws Exception{
-		return CallBack.success(roleService.update(form));
-	}
-	
-	
 	@ApiOperation(value = "根据id查询", notes = "根据id查询")
 	@GetMapping(value = "/{oid}")
 	public CallBack<RoleVO> queryById(@PathVariable Integer oid) {

app/sysuser/src/main/java/com/zrqx/sysuser/bg/service/operatepower/BaseOperatepowerService.java

@@ -18,15 +18,6 @@ public interface BaseOperatepowerService extends BaseService<BaseOperatepower, I
 	 */
 	Boolean save(BaseOperatepower form);
 
-	/**
-	 * 修改按钮
-	 * @param form
-	 * @return
-	 * @author lpf
-	 * @date: 2020年2月27日 下午10:20:30
-	 */
-	Boolean update(BaseOperatepower form);
-
 	PageInfo<BaseOperatepower> page(BaseOperatepower form, PageParam pageParam);
 
 	/**

app/sysuser/src/main/java/com/zrqx/sysuser/bg/service/operatepower/BaseOperatepowerServiceImpl.java

@@ -25,14 +25,14 @@ public class BaseOperatepowerServiceImpl extends BaseServiceImpl<BaseOperatepowe
 
 	@Override
 	public Boolean save(BaseOperatepower form) {
-		form.setId(null);
-		form.setNum(0);
-		return super.insert(form);
-	}
-
-	@Override
-	public Boolean update(BaseOperatepower form) {
-		return super.updateByPrimaryKey(form);
+		if(form.getId() == null) {
+			form.setId(null);
+			form.setNum(0);
+			super.insert(form);		
+		}else{
+			super.updateByPrimaryKey(form);
+		}
+		return true;
 	}
 
 	@Override

app/sysuser/src/main/java/com/zrqx/sysuser/bg/service/operatepower/OperatepowerService.java

@@ -20,7 +20,7 @@ public interface OperatepowerService extends BaseService<Operatepower,Integer>{
 	List<Operatepower> page();
 	
 	 /**
-	  * 添加按钮
+	  * 添加/修改按钮
 	 * @param form
 	 * @return
 	 * @author zzg
@@ -28,15 +28,6 @@ public interface OperatepowerService extends BaseService<Operatepower,Integer>{
 	 */
 	boolean save(Operatepower form);
 	
-	/**
-	  * 修改按钮
-	 * @param form
-	 * @return
-	 * @author zzg
-	 * @date: 2019年6月20日 下午2:37:42
-	 */
-	boolean update(Operatepower form) throws Exception;
-	
 	 /**
 	  * 根据id查询
 	 * @param id

app/sysuser/src/main/java/com/zrqx/sysuser/bg/service/operatepower/OperatepowerServiceImpl.java

@@ -36,7 +36,13 @@ public class OperatepowerServiceImpl extends BaseServiceImpl<Operatepower,Intege
 	
 	@Override
 	public boolean save(Operatepower form) {
-		operatepowerMapper.insert(form);
+		if(form.getId() == null) {
+			operatepowerMapper.insert(form);	
+		}else {
+			Operatepower entity = super.notNull(form.getId());
+			BeanUtils.copyProperties(form, entity);
+			operatepowerMapper.updateByPrimaryKey(entity);
+		}
 		return true;
 	}
 	@Override
@@ -44,12 +50,6 @@ public class OperatepowerServiceImpl extends BaseServiceImpl<Operatepower,Intege
 		return super.notNull(id);
 	}
 	@Override
-	public boolean update(Operatepower form) throws Exception {
-		Operatepower entity = super.notNull(form.getId());
-		BeanUtils.copyProperties(form, entity);
-		return operatepowerMapper.updateByPrimaryKey(entity)>0;
-	}
-	@Override
 	public Integer getMaxOrderNum(Integer id) {
 		PageHelper.startPage(1, 1, "sort desc");
 		Integer maxOrderNum = operatepowerMapper.getMaxOrderNum(id);

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

@@ -45,17 +45,6 @@ public interface RoleService extends BaseService<Role,Integer>{
 	 * @date: 2019年6月20日 下午4:41:57
 	 */
 	boolean save(SaveRoleForm form);
-	
-	 /**
-	  * 修改角色
-	 * @param form
-	 * @return
-	 * @author zzg
-	 * @date: 2019年6月21日 下午2:13:11
-	 */
-	boolean update(SaveRoleForm form);
-	
-	
-	
+		
 	 
 }

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

@@ -68,32 +68,26 @@ public class RoleServiceImpl extends BaseServiceImpl<Role,Integer> implements Ro
 	@Override
 	public boolean save(SaveRoleForm form) {
 		Role role = new Role();
-		BeanUtils.copyProperties(form, role);
-		role.setCreateTime(new Date());
-		role.setCreater(redis.getUser().getUserName());
-		super.insert(role);
+		if(form.getId() == null) {
+			BeanUtils.copyProperties(form, role);
+			role.setCreateTime(new Date());
+			role.setCreater(redis.getUser().getUserName());
+			super.insert(role);
+		}else {
+			role = super.notNull(form.getId());
+			BeanUtils.copyProperties(form, role);
+			role.setModifDate(new Date());
+			role.setModifIer(redis.getUser().getUserName());
+			super.updateByPrimaryKey(role);
+			//删除原来的角色与按钮的绑定关系
+			roleOperateRelationService.batchDelete(form.getId());
+		}
 		//角色绑定按钮
 		roleOperateRelationService.save(form.getOpreatIds(), role.getId());
 		return true;
 	}
 
 	@Override
-	public boolean update(SaveRoleForm form) {
-		Role role = super.notNull(form.getId());
-		BeanUtils.copyProperties(form, role);
-		role.setModifDate(new Date());
-		role.setModifIer(redis.getUser().getUserName());
-		super.updateByPrimaryKey(role);
-		//删除原来的角色与按钮的绑定关系
-		roleOperateRelationService.batchDelete(form.getId());
-		//重新绑定角色与按钮的关系
-		roleOperateRelationService.save(form.getOpreatIds(), role.getId());
-		return true;
-	}
-
-	
-
-	@Override
 	public boolean batchDelete(List<Integer> ids) {
 		ids.forEach(vo ->{
 			//删除用户跟角色的关系