diff --git a/pom.xml b/pom.xml index 992f6fb..3203173 100644 --- a/pom.xml +++ b/pom.xml @@ -36,7 +36,6 @@ - org.springframework @@ -118,19 +117,6 @@ ${oshi.version} - - - io.springfox - springfox-boot-starter - ${swagger.version} - - - io.swagger - swagger-models - - - - commons-io diff --git a/rwk-admin/pom.xml b/rwk-admin/pom.xml index f712d20..976cd86 100644 --- a/rwk-admin/pom.xml +++ b/rwk-admin/pom.xml @@ -8,7 +8,7 @@ 4.7.9 4.0.0 - jar + war rwk-admin @@ -31,10 +31,10 @@ - - io.springfox - springfox-boot-starter - + + + + @@ -81,11 +81,6 @@ test 2.5.0 - - com.h2database - h2 - test - org.junit.vintage diff --git a/rwk-admin/src/main/java/com/rwk/web/controller/ability/RwkAddressBookController.java b/rwk-admin/src/main/java/com/rwk/web/controller/ability/RwkAddressBookController.java index 919f039..597eb54 100644 --- a/rwk-admin/src/main/java/com/rwk/web/controller/ability/RwkAddressBookController.java +++ b/rwk-admin/src/main/java/com/rwk/web/controller/ability/RwkAddressBookController.java @@ -8,8 +8,7 @@ import com.rwk.common.core.domain.Ztree; import com.rwk.common.core.domain.entity.SysDept; import com.rwk.common.core.domain.entity.SysUser; import com.rwk.common.utils.ShiroUtils; -import com.rwk.system.domain.RwkAddressGroup; -import com.rwk.system.domain.RwkBookGroup; +import com.rwk.system.domain.*; import com.rwk.system.service.IRwkAddressGroupService; import com.rwk.system.service.IRwkBookGroupService; import org.apache.shiro.authz.annotation.RequiresPermissions; @@ -23,7 +22,6 @@ import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.ResponseBody; import com.rwk.common.annotation.Log; import com.rwk.common.enums.BusinessType; -import com.rwk.system.domain.RwkAddressBook; import com.rwk.system.service.IRwkAddressBookService; import com.rwk.common.core.controller.BaseController; import com.rwk.common.core.domain.AjaxResult; @@ -184,20 +182,21 @@ public class RwkAddressBookController extends BaseController */ @PostMapping("/address/move") @ResponseBody - public AjaxResult moveSave(String addressIds, String byGroupId,String groupIds) + public AjaxResult moveSave(RwkBookGroupVo vo) { - String[] addressIdArray = addressIds.split(","); - String[] groupIdArray = groupIds.split(","); + String[] addressIdArray = vo.getAddressIds().split(","); + String[] groupIdArray = vo.getGroupIds().split(","); List list=new ArrayList<>(); for (int i = 0; i < addressIdArray.length; i++){ for (int j = 0; j < groupIdArray.length; j++){ RwkBookGroup rbg= new RwkBookGroup(); rbg.setBookId(Long.valueOf(addressIdArray[i])); rbg.setGroupId(Long.valueOf(groupIdArray[j])); + rbg.setByGroupId(Long.valueOf(vo.getByGroupId())); list.add(rbg); } } - return toAjax(rwkBookGroupService.insertRwkBookGroupList(list)); + return toAjax(rwkBookGroupService.updateRwkBookGroupList(list)); } /** @@ -244,7 +243,7 @@ public class RwkAddressBookController extends BaseController mmap.put("groups", rwkAddressGroupService.selectRwkAddressGroupList(sysUser.getLoginName())); mmap.put("addressIds", ids); mmap.put("byGroupId", byGroupId); - return prefix + "/groupTree"; + return prefix + "/groupTreeMove"; } diff --git a/rwk-admin/src/main/java/com/rwk/web/core/config/SwaggerConfig.java b/rwk-admin/src/main/java/com/rwk/web/core/config/SwaggerConfig.java index 3955235..299a580 100644 --- a/rwk-admin/src/main/java/com/rwk/web/core/config/SwaggerConfig.java +++ b/rwk-admin/src/main/java/com/rwk/web/core/config/SwaggerConfig.java @@ -1,67 +1,67 @@ -package com.rwk.web.core.config; - -import org.springframework.beans.factory.annotation.Value; -import org.springframework.context.annotation.Bean; -import org.springframework.context.annotation.Configuration; -import com.rwk.common.config.RuoYiConfig; -import io.swagger.annotations.ApiOperation; -import springfox.documentation.builders.ApiInfoBuilder; -import springfox.documentation.builders.PathSelectors; -import springfox.documentation.builders.RequestHandlerSelectors; -import springfox.documentation.service.ApiInfo; -import springfox.documentation.service.Contact; -import springfox.documentation.spi.DocumentationType; -import springfox.documentation.spring.web.plugins.Docket; - -/** - * Swagger2的接口配置 - * - * @author ruoyi - */ -@Configuration -public class SwaggerConfig -{ - /** 是否开启swagger */ - @Value("${swagger.enabled}") - private boolean enabled; - - /** - * 创建API - */ - @Bean - public Docket createRestApi() - { - return new Docket(DocumentationType.OAS_30) - // 是否启用Swagger - .enable(enabled) - // 用来创建该API的基本信息,展示在文档的页面中(自定义展示的信息) - .apiInfo(apiInfo()) - // 设置哪些接口暴露给Swagger展示 - .select() - // 扫描所有有注解的api,用这种方式更灵活 - .apis(RequestHandlerSelectors.withMethodAnnotation(ApiOperation.class)) - // 扫描指定包中的swagger注解 - //.apis(RequestHandlerSelectors.basePackage("com.rwk.project.tool.swagger")) - // 扫描所有 .apis(RequestHandlerSelectors.any()) - .paths(PathSelectors.any()) - .build(); - } - - /** - * 添加摘要信息 - */ - private ApiInfo apiInfo() - { - // 用ApiInfoBuilder进行定制 - return new ApiInfoBuilder() - // 设置标题 - .title("标题:管理系统_接口文档") - // 描述 - .description("描述:用于管理集团旗下公司的人员信息,具体包括XXX,XXX模块...") - // 作者信息 - .contact(new Contact(RuoYiConfig.getName(), null, null)) - // 版本 - .version("版本号:" + RuoYiConfig.getVersion()) - .build(); - } -} +//package com.rwk.web.core.config; +// +//import org.springframework.beans.factory.annotation.Value; +//import org.springframework.context.annotation.Bean; +//import org.springframework.context.annotation.Configuration; +//import com.rwk.common.config.RuoYiConfig; +//import io.swagger.annotations.ApiOperation; +//import springfox.documentation.builders.ApiInfoBuilder; +//import springfox.documentation.builders.PathSelectors; +//import springfox.documentation.builders.RequestHandlerSelectors; +//import springfox.documentation.service.ApiInfo; +//import springfox.documentation.service.Contact; +//import springfox.documentation.spi.DocumentationType; +//import springfox.documentation.spring.web.plugins.Docket; +// +///** +// * Swagger2的接口配置 +// * +// * @author ruoyi +// */ +//@Configuration +//public class SwaggerConfig +//{ +// /** 是否开启swagger */ +// @Value("${swagger.enabled}") +// private boolean enabled; +// +// /** +// * 创建API +// */ +// @Bean +// public Docket createRestApi() +// { +// return new Docket(DocumentationType.OAS_30) +// // 是否启用Swagger +// .enable(enabled) +// // 用来创建该API的基本信息,展示在文档的页面中(自定义展示的信息) +// .apiInfo(apiInfo()) +// // 设置哪些接口暴露给Swagger展示 +// .select() +// // 扫描所有有注解的api,用这种方式更灵活 +// .apis(RequestHandlerSelectors.withMethodAnnotation(ApiOperation.class)) +// // 扫描指定包中的swagger注解 +// //.apis(RequestHandlerSelectors.basePackage("com.rwk.project.tool.swagger")) +// // 扫描所有 .apis(RequestHandlerSelectors.any()) +// .paths(PathSelectors.any()) +// .build(); +// } +// +// /** +// * 添加摘要信息 +// */ +// private ApiInfo apiInfo() +// { +// // 用ApiInfoBuilder进行定制 +// return new ApiInfoBuilder() +// // 设置标题 +// .title("标题:管理系统_接口文档") +// // 描述 +// .description("描述:用于管理集团旗下公司的人员信息,具体包括XXX,XXX模块...") +// // 作者信息 +// .contact(new Contact(RuoYiConfig.getName(), null, null)) +// // 版本 +// .version("版本号:" + RuoYiConfig.getVersion()) +// .build(); +// } +//} diff --git a/rwk-admin/src/main/resources/application-druid.yml b/rwk-admin/src/main/resources/application-druid.yml index a91fa80..e22089d 100644 --- a/rwk-admin/src/main/resources/application-druid.yml +++ b/rwk-admin/src/main/resources/application-druid.yml @@ -6,8 +6,8 @@ spring: druid: # 主库数据源 master: - url: jdbc:dm://150.158.136.65:5236/TZB_RWK?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8&nullCatalogMeansCurrent=true - username: TZB_RWK + url: jdbc:dm://150.158.136.65:5236/TZB_ZGC?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8&nullCatalogMeansCurrent=true + username: TZB_ZGC password: hk64335593 # 从库数据源 slave: diff --git a/rwk-admin/src/main/resources/application.yml b/rwk-admin/src/main/resources/application.yml index 52b3e50..0eb927f 100644 --- a/rwk-admin/src/main/resources/application.yml +++ b/rwk-admin/src/main/resources/application.yml @@ -9,7 +9,7 @@ ruoyi: # 实例演示开关 demoEnabled: false # 文件路径 示例( Windows配置D:/ruoyi/uploadPath,Linux配置 /home/ruoyi/uploadPath) - profile: D:/ruoyi/uploadPath + profile: /opt/data # profile: /home/ruoyi/uploadPath # 获取ip地址开关 addressEnabled: false @@ -17,7 +17,7 @@ ruoyi: # 开发环境配置 server: # 服务器的HTTP端口,默认为80 - port: 8080 + port: 8088 servlet: # 应用的访问路径 context-path: / diff --git a/rwk-admin/src/main/resources/logback.xml b/rwk-admin/src/main/resources/logback.xml index 0fceee7..38569dd 100644 --- a/rwk-admin/src/main/resources/logback.xml +++ b/rwk-admin/src/main/resources/logback.xml @@ -1,7 +1,7 @@ - + diff --git a/rwk-admin/src/main/resources/static/img/login-background.jpg b/rwk-admin/src/main/resources/static/img/login-background.jpg index 11998f1..72aa3ea 100644 Binary files a/rwk-admin/src/main/resources/static/img/login-background.jpg and b/rwk-admin/src/main/resources/static/img/login-background.jpg differ diff --git a/rwk-admin/src/main/resources/static/ruoyi/css/address.css b/rwk-admin/src/main/resources/static/ruoyi/css/address.css index 6cc698c..d4ea585 100644 --- a/rwk-admin/src/main/resources/static/ruoyi/css/address.css +++ b/rwk-admin/src/main/resources/static/ruoyi/css/address.css @@ -82,3 +82,55 @@ text-align: right; margin-left: 14px; } + +/*.trapezoid {*/ +/* width: 0;*/ +/* height: 0;*/ +/* border-bottom: 100px solid red; !* 梯形的底边 *!*/ +/* border-left: 50px solid transparent; !* 左侧斜边 *!*/ +/* border-right: 50px solid transparent; !* 右侧斜边 *!*/ +/* transform: rotate(-90deg); !* 反方向旋转 90 度 *!*/ +/* transform-origin: top left; !* 设置旋转中心点 *!*/ +/*}*/ + + +.container { + position: relative; + width: 300px; /* Adjust the width as needed */ + height: 400px; /* Adjust the height as needed */ + background-color: white; + overflow: hidden; +} + +.container::before { + content: ''; + position: absolute; + width: 2px; /* Thickness of the vertical line */ + height: 100%; + background-color: black; + left: 50%; /* Center the line */ + transform: translateX(-50%); +} + +.container::after { + content: ''; + position: absolute; + width: 60px; /* Width of the irregular shape */ + height: 60px; /* Height of the irregular shape */ + background-color: black; + border-radius: 50%; /* Make it circular */ + top: 100px; /* Position it below the vertical line */ + left: calc(50% - 30px); /* Center it horizontally */ + transform: translateX(-50%); +} + +.vertical-line { + width: 90px; + height: 10px; + background-color: #CECECE; + border-radius: 50% / 100% 100% 0 0; + transform: rotate(-90deg); + margin-top: 270px; + margin-left: -50px; +} + diff --git a/rwk-admin/src/main/resources/templates/login.html b/rwk-admin/src/main/resources/templates/login.html index f465fb4..4c1e5fc 100644 --- a/rwk-admin/src/main/resources/templates/login.html +++ b/rwk-admin/src/main/resources/templates/login.html @@ -26,8 +26,8 @@

登录:

- - + +
diff --git a/rwk-admin/src/main/resources/templates/main.html b/rwk-admin/src/main/resources/templates/main.html index 9cd24ca..60c4daa 100644 --- a/rwk-admin/src/main/resources/templates/main.html +++ b/rwk-admin/src/main/resources/templates/main.html @@ -32,7 +32,7 @@
-
同年教育培训次数
+
同年教育培训人次
5321
@@ -45,7 +45,7 @@
-
未参会率
+
知联之友
5%
diff --git a/rwk-admin/src/main/resources/templates/system/addressbook/addbook.html b/rwk-admin/src/main/resources/templates/system/addressbook/addbook.html index 3d2f0d5..547c268 100644 --- a/rwk-admin/src/main/resources/templates/system/addressbook/addbook.html +++ b/rwk-admin/src/main/resources/templates/system/addressbook/addbook.html @@ -79,6 +79,8 @@ return; }else { $.operate.save(prefix + "/address/add", $('#form-addressbook-add').serialize()); + $.modal.close(); + parent.location.reload(true); } } diff --git a/rwk-admin/src/main/resources/templates/system/addressbook/addgroup.html b/rwk-admin/src/main/resources/templates/system/addressbook/addgroup.html index 1955fd2..653dd68 100644 --- a/rwk-admin/src/main/resources/templates/system/addressbook/addgroup.html +++ b/rwk-admin/src/main/resources/templates/system/addressbook/addgroup.html @@ -38,6 +38,8 @@ return; }else { $.operate.save(prefix + "/addgroup/add", $('#form-group-add').serialize()); + $.modal.close(); + parent.location.reload(true); } } diff --git a/rwk-admin/src/main/resources/templates/system/addressbook/addressbook.html b/rwk-admin/src/main/resources/templates/system/addressbook/addressbook.html index 7c4b475..1e08f11 100644 --- a/rwk-admin/src/main/resources/templates/system/addressbook/addressbook.html +++ b/rwk-admin/src/main/resources/templates/system/addressbook/addressbook.html @@ -10,7 +10,7 @@
-
+
-
-
+
+
  • [[${item.groupName}]]([[${item.num}]])
    @@ -82,7 +82,10 @@
-
+
+
+
+
@@ -147,8 +150,6 @@ yes: function (index, layero) { var iframeWin = layero.find('iframe')[0]; iframeWin.contentWindow.submitHandler(index, layero); - $.modal.close(index); - window.location.reload(true); } }; $.modal.openOptions(options); @@ -169,8 +170,6 @@ yes: function (index, layero) { var iframeWin = layero.find('iframe')[0]; iframeWin.contentWindow.submitHandler(index, layero); - $.modal.close(index); - window.location.reload(true); } }; $.modal.openOptions(options); @@ -192,8 +191,6 @@ yes: function (index, layero) { var iframeWin = layero.find('iframe')[0]; iframeWin.contentWindow.submitHandler(index, layero); - $.modal.close(index); - window.location.reload(true); } }; $.modal.openOptions(options); @@ -212,15 +209,13 @@ type:1, btn: ['确定','取消'], closeBtn: 0, - width: 750, + width: 320, height: 520, offset:'150px', anim:2, yes: function (index, layero) { var iframeWin = layero.find('iframe')[0]; iframeWin.contentWindow.submitHandler(index, layero); - $.modal.close(index); - window.location.reload(true); } }; $.modal.openOptions(options); @@ -240,15 +235,13 @@ type:1, btn: ['确定','取消'], closeBtn: 0, - width: 750, + width: 320, height: 520, offset:'150px', anim:2, yes: function (index, layero) { var iframeWin = layero.find('iframe')[0]; iframeWin.contentWindow.submitHandler(index, layero); - $.modal.close(index); - window.location.reload(true); } }; $.modal.openOptions(options); @@ -271,6 +264,7 @@ var options = { url: prefix + "/list", editUrl: prefix + "/edit/{id}", + exportUrl: prefix + "/export", height: 580, pagination:false, sidePagination: "client", diff --git a/rwk-admin/src/main/resources/templates/system/addressbook/editbook.html b/rwk-admin/src/main/resources/templates/system/addressbook/editbook.html index 81d970a..dd76fee 100644 --- a/rwk-admin/src/main/resources/templates/system/addressbook/editbook.html +++ b/rwk-admin/src/main/resources/templates/system/addressbook/editbook.html @@ -62,6 +62,8 @@ return; }else { $.operate.save(prefix + "/address/edit", $('#form-addressbook-edit').serialize()); + $.modal.close(); + parent.location.reload(true); } } diff --git a/rwk-admin/src/main/resources/templates/system/addressbook/groupTree.html b/rwk-admin/src/main/resources/templates/system/addressbook/groupTree.html index d2e4151..0c20af0 100644 --- a/rwk-admin/src/main/resources/templates/system/addressbook/groupTree.html +++ b/rwk-admin/src/main/resources/templates/system/addressbook/groupTree.html @@ -13,13 +13,12 @@ -
-
+
  • [[${item.groupName}]]
    @@ -60,6 +59,8 @@ }else { $('#groupIds').val(groupids.toString()); $.operate.save(prefix + "/address/copy", $('#form-group').serialize()); + $.modal.close(); + parent.location.reload(true); } } diff --git a/rwk-admin/src/main/resources/templates/system/addressbook/groupTreeMove.html b/rwk-admin/src/main/resources/templates/system/addressbook/groupTreeMove.html index 61ef5b2..bb232ab 100644 --- a/rwk-admin/src/main/resources/templates/system/addressbook/groupTreeMove.html +++ b/rwk-admin/src/main/resources/templates/system/addressbook/groupTreeMove.html @@ -20,7 +20,7 @@
    -
    +
    • [[${item.groupName}]]
      @@ -42,18 +42,15 @@ object.classList.add("click-bg"); } - function hasClass (ele, className) { - var reg = new RegExp('(^|\\s)' + className + '(\\s|$)') - return reg.test(ele.className) - } - function submitHandler() { if (groupids.length==0){ $.modal.alertWarning("请选择组名再提交!"); return; }else { $('#groupIds').val(groupids.toString()); - $.operate.update(prefix + "/address/move", $('#form-group').serialize()); + $.operate.save(prefix + "/address/move", $('#form-group').serialize()); + $.modal.close(); + parent.location.reload(true); } } diff --git a/rwk-framework/pom.xml b/rwk-framework/pom.xml index bc08ca2..2c5f751 100644 --- a/rwk-framework/pom.xml +++ b/rwk-framework/pom.xml @@ -21,6 +21,12 @@ org.springframework.boot spring-boot-starter-web + + + org.springframework.boot + spring-boot-starter-tomcat + + diff --git a/rwk-system/src/main/java/com/rwk/system/domain/RwkAddressBook.java b/rwk-system/src/main/java/com/rwk/system/domain/RwkAddressBook.java index 267451a..a4e8571 100644 --- a/rwk-system/src/main/java/com/rwk/system/domain/RwkAddressBook.java +++ b/rwk-system/src/main/java/com/rwk/system/domain/RwkAddressBook.java @@ -29,12 +29,10 @@ public class RwkAddressBook extends BaseEntity private String information; /** 归属部门/个人 */ - @Excel(name = "归属部门/个人") private Long addressGroup; /** 创建时间 */ @JsonFormat(pattern = "yyyy-MM-dd") - @Excel(name = "创建时间", width = 30, dateFormat = "yyyy-MM-dd") private Date createDate; /** email */ diff --git a/rwk-system/src/main/java/com/rwk/system/domain/RwkBookGroup.java b/rwk-system/src/main/java/com/rwk/system/domain/RwkBookGroup.java index aaeb7a0..19018d1 100644 --- a/rwk-system/src/main/java/com/rwk/system/domain/RwkBookGroup.java +++ b/rwk-system/src/main/java/com/rwk/system/domain/RwkBookGroup.java @@ -23,6 +23,8 @@ public class RwkBookGroup extends BaseEntity @Excel(name = "分组id") private Long groupId; + private Long byGroupId; + public void setBookId(Long bookId) { this.bookId = bookId; @@ -33,6 +35,14 @@ public class RwkBookGroup extends BaseEntity return bookId; } + public Long getByGroupId() { + return byGroupId; + } + + public void setByGroupId(Long byGroupId) { + this.byGroupId = byGroupId; + } + public Long getGroupId() { return groupId; } diff --git a/rwk-system/src/main/java/com/rwk/system/domain/RwkBookGroupVo.java b/rwk-system/src/main/java/com/rwk/system/domain/RwkBookGroupVo.java index 1683b3e..dace96a 100644 --- a/rwk-system/src/main/java/com/rwk/system/domain/RwkBookGroupVo.java +++ b/rwk-system/src/main/java/com/rwk/system/domain/RwkBookGroupVo.java @@ -1,4 +1,32 @@ package com.rwk.system.domain; public class RwkBookGroupVo { + + private String addressIds; + private String byGroupId; + private String groupIds; + + public String getAddressIds() { + return addressIds; + } + + public void setAddressIds(String addressIds) { + this.addressIds = addressIds; + } + + public String getByGroupId() { + return byGroupId; + } + + public void setByGroupId(String byGroupId) { + this.byGroupId = byGroupId; + } + + public String getGroupIds() { + return groupIds; + } + + public void setGroupIds(String groupIds) { + this.groupIds = groupIds; + } } diff --git a/rwk-system/src/main/java/com/rwk/system/mapper/RwkBookGroupMapper.java b/rwk-system/src/main/java/com/rwk/system/mapper/RwkBookGroupMapper.java index 87792be..3f2b530 100644 --- a/rwk-system/src/main/java/com/rwk/system/mapper/RwkBookGroupMapper.java +++ b/rwk-system/src/main/java/com/rwk/system/mapper/RwkBookGroupMapper.java @@ -45,6 +45,9 @@ public interface RwkBookGroupMapper */ public int updateRwkBookGroup(RwkBookGroup rwkBookGroup); + public int updateRwkBookGroupList(@Param("rwkBookGroupList") List rwkBookGroupList); + + /** * 删除【请填写功能名称】 * diff --git a/rwk-system/src/main/java/com/rwk/system/service/IRwkBookGroupService.java b/rwk-system/src/main/java/com/rwk/system/service/IRwkBookGroupService.java index 9b257c3..f476b61 100644 --- a/rwk-system/src/main/java/com/rwk/system/service/IRwkBookGroupService.java +++ b/rwk-system/src/main/java/com/rwk/system/service/IRwkBookGroupService.java @@ -44,6 +44,9 @@ public interface IRwkBookGroupService */ public int updateRwkBookGroup(RwkBookGroup rwkBookGroup); + public int updateRwkBookGroupList(List rwkBookGroup); + + /** * 批量删除【请填写功能名称】 * diff --git a/rwk-system/src/main/java/com/rwk/system/service/impl/RwkBookGroupServiceImpl.java b/rwk-system/src/main/java/com/rwk/system/service/impl/RwkBookGroupServiceImpl.java index 5ce7c85..75f48cc 100644 --- a/rwk-system/src/main/java/com/rwk/system/service/impl/RwkBookGroupServiceImpl.java +++ b/rwk-system/src/main/java/com/rwk/system/service/impl/RwkBookGroupServiceImpl.java @@ -81,6 +81,12 @@ public class RwkBookGroupServiceImpl implements IRwkBookGroupService return rwkBookGroupMapper.updateRwkBookGroup(rwkBookGroup); } + @Override + public int updateRwkBookGroupList(List rwkBookGroup) + { + return rwkBookGroupMapper.updateRwkBookGroupList(rwkBookGroup); + } + /** * 批量删除【请填写功能名称】 * diff --git a/rwk-system/src/main/resources/mapper/system/RwkBookGroupMapper.xml b/rwk-system/src/main/resources/mapper/system/RwkBookGroupMapper.xml index 16cdffe..ea01b2c 100644 --- a/rwk-system/src/main/resources/mapper/system/RwkBookGroupMapper.xml +++ b/rwk-system/src/main/resources/mapper/system/RwkBookGroupMapper.xml @@ -55,6 +55,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" where book_id = #{bookId} + + + update rwk_book_group set group_id=#{rwkBookGroup.groupId} where book_id = #{rwkBookGroup.bookId} and group_id=#{rwkBookGroup.byGroupId} + + + delete from rwk_book_group where book_id = #{bookId}