diff --git a/src/main/java/com/example/demo/mapper/PermissionMapper.java b/src/main/java/com/example/demo/mapper/PermissionMapper.java index 2407e0d..8bb0c9e 100644 --- a/src/main/java/com/example/demo/mapper/PermissionMapper.java +++ b/src/main/java/com/example/demo/mapper/PermissionMapper.java @@ -25,9 +25,9 @@ public interface PermissionMapper { Integer updatePermission(Admin admin); Integer addPermission(Admin admin); List getRole(String token); - Integer addadminRole(AdminRole adminRole); +// Integer addadminRole(AdminRole adminRole); Integer deleteAdmin(Integer id); - Integer deleteAdminRole(Integer id); +// Integer deleteAdminRole(Integer id); Integer updateAdminRole(AdminRole adminRole); Integer updateAdmin(Admin admin); } diff --git a/src/main/java/com/example/demo/serviceImpl/PermissionServiceImpl.java b/src/main/java/com/example/demo/serviceImpl/PermissionServiceImpl.java index 0d01879..7001b9b 100644 --- a/src/main/java/com/example/demo/serviceImpl/PermissionServiceImpl.java +++ b/src/main/java/com/example/demo/serviceImpl/PermissionServiceImpl.java @@ -94,11 +94,7 @@ public class PermissionServiceImpl implements PermissionService { // 将地区列表转换为逗号分隔的字符串 String markets = String.join(",", admin.getMarket()); admin.setMarket(Collections.singletonList(markets)); - permissionMapper.addPermission(admin); - AdminRole adminRole = new AdminRole(); - adminRole.setAdminId(admin.getId()); - adminRole.setRoleId(admin.getRoleId()); - return permissionMapper.addadminRole(adminRole); + return permissionMapper.addPermission(admin); } } @@ -114,7 +110,6 @@ public class PermissionServiceImpl implements PermissionService { return -1; } - permissionMapper.deleteAdminRole(id); return permissionMapper.deleteAdmin(id); } diff --git a/src/main/resources/mapper/PermissionMapper.xml b/src/main/resources/mapper/PermissionMapper.xml index d7a0278..2369465 100644 --- a/src/main/resources/mapper/PermissionMapper.xml +++ b/src/main/resources/mapper/PermissionMapper.xml @@ -2,13 +2,13 @@ - insert into admin(admin_name,machine_id,account,password,market,postiton,remark,admin_status) - values(#{adminName},#{machineId},#{account},#{password},#{market[0]},#{postiton},#{remark},1) - - - insert into admin_role(admin_id,role_id) - values(#{adminId},#{roleId}) + insert into admin(admin_name, machine_id, account, password, market, postiton, remark, admin_status, role_id) + values (#{adminName}, #{machineId}, #{account}, #{password}, #{market[0]}, #{postiton}, #{remark}, 1 ,#{roleId}) + + + + update admin @@ -19,13 +19,13 @@ where id=#{id} - update admin_role + update admin role_id= #{roleId}, - where admin_id= #{id} + where id= #{adminId} @@ -43,44 +43,53 @@ remark= #{remark}, - market= #{market[0]} + market= #{market[0]} where account= #{account} - delete from admin where id=#{id} - - - delete from admin_role where admin_id= #{id} + delete + from admin + where id = #{id} + + + + +