解决冲突

system-manage/src/main/java/org/arch/manage/mapper/UsersRolesMapper.java

+/**
+* Copyright (C) 2018-2020
+* All rights reserved, Designed By www.yixiang.co
+* 注意：
+* 本软件为www.yixiang.co开发研制
+*/
+package org.arch.manage.mapper;
+
+import org.apache.ibatis.annotations.Delete;
+import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+import org.arch.common.modules.sysmange.vo.UsersRoles;
+import org.arch.mybatis.common.mapper.CoreMapper;
+import org.springframework.stereotype.Repository;
+
+/**
+* @author hupeng
+* @date 2020-05-16
+*/
+@Repository
+@Mapper
+public interface UsersRolesMapper extends CoreMapper<UsersRoles> {
+
+	/**
+     * 解绑人员角色菜
+     * @param id 人员ID
+     */
+    @Delete("delete from sys_users_roles where user_id = #{id}")
+    void removeRoles(@Param("id") Long id);
+}

system-manage/src/main/java/org/arch/manage/service/impl/UsersRolesServiceImpl.java

+package org.arch.manage.service.impl;
+
+
+import org.arch.common.modules.sysmange.vo.UsersRoles;
+import org.arch.manage.mapper.UsersRolesMapper;
+import org.arch.manage.service.UsersRolesService;
+import org.arch.mybatis.common.service.impl.BaseServiceImpl;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+/**
+ * 用户角色
+ */
+@Service
+public class UsersRolesServiceImpl extends BaseServiceImpl<UsersRolesMapper, UsersRoles> implements UsersRolesService {
+
+	@Autowired
+	UsersRolesMapper usersRolesMapper;
+	@Override
+	public boolean removeRoles(Long id) {
+		// TODO Auto-generated method stub
+		usersRolesMapper.removeRoles(id);
+		return true;
+	}
+
+}