zenghuapei
/
cyywl_server
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Compare commits

base: zenghuapei:a4e18f6c9c3433ef69cee5f7299a41b72ed36da6
Branches Tags
zenghuapei:master
zenghuapei:test
zenghuapei:feature/mall_product
...
compare: zenghuapei:a37b5f0fcc52a5cbe59aa89c534f06f32a441879
Branches Tags
zenghuapei:master
zenghuapei:test
zenghuapei:feature/mall_product

5 Commits
a4e18f6c9c ... a37b5f0fcc

Author SHA1 Message Date
tangqian a37b5f0fcc fix: 修改部门 2023-05-31 18:02:53 +08:00
tangqian 4a2765bd1b Merge branch 'feature/mall_product' 2023-05-31 17:46:31 +08:00
tangqian 3ea7926767 Merge branch 'feature/mall_product' 2023-05-31 17:29:41 +08:00
tianyu da15156869 Merge pull request 'feature/mall_product' (#7) from feature/mall_product into master 
Reviewed-on: http://117.33.142.185:3000/zenghuapei/cyywl_server/pulls/7
 2023-05-31 17:22:06 +08:00
tianyu fc13565838 Merge pull request 'feature/mall_product' (#6) from feature/mall_product into master 
Reviewed-on: http://117.33.142.185:3000/zenghuapei/cyywl_server/pulls/6
 2023-05-31 15:00:36 +08:00
1 changed files with 33 additions and 16 deletions
Show Stats Expand all files Collapse all files

39
yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/dept/DeptServiceImpl.java
View File

@ -132,21 +132,38 @@ public class DeptServiceImpl implements DeptService {
reqVO.setParentId(DeptIdEnum.ROOT.getId()); reqVO.setParentId(DeptIdEnum.ROOT.getId());
} }
validateForCreateOrUpdate(reqVO.getId(), reqVO.getParentId(), reqVO.getName()); validateForCreateOrUpdate(reqVO.getId(), reqVO.getParentId(), reqVO.getName());
// 更新部门 // // 更新部门
DeptDO updateObj = DeptConvert.INSTANCE.convert(reqVO); // DeptDO updateObj = DeptConvert.INSTANCE.convert(reqVO);
if (DeptIdEnum.ROOT.getId().equals(updateObj.getParentId())) { // if (DeptIdEnum.ROOT.getId().equals(updateObj.getParentId())) {
updateObj.setParentOrganizationIds(updateObj.getId() + ""); // updateObj.setParentOrganizationIds(updateObj.getId() + "");
updateObj.setParentOrganizationName(updateObj.getName()); // updateObj.setParentOrganizationName(updateObj.getName());
} else { // } else {
DeptDO parent = deptMapper.selectById(reqVO.getParentId()); // DeptDO parent = deptMapper.selectById(reqVO.getParentId());
updateObj.setParentOrganizationIds(parent.getParentOrganizationIds() + "," + updateObj.getId()); // updateObj.setParentOrganizationIds(parent.getParentOrganizationIds() + "," + updateObj.getId());
updateObj.setParentOrganizationName(parent.getParentOrganizationName() + ">" + updateObj.getName()); // updateObj.setParentOrganizationName(parent.getParentOrganizationName() + ">" + updateObj.getName());
} // }
deptMapper.updateById(updateObj); DeptDO deptDO = deptMapper.selectById(reqVO.getId());
List<DeptDO> deptDOS = deptMapper.selectListDeep(Wrappers.<DeptDO>lambdaQuery().like(DeptDO::getParentOrganizationIds, reqVO.getId()));
deptDOS.forEach(x -> {
x.setParentOrganizationName(x.getParentOrganizationName().replace(deptDO.getName(), reqVO.getName()));
});
deptMapper.updateBatch(deptDOS,deptDOS.size());
// deptMapper.updateById(updateObj);
// 发送刷新消息 // 发送刷新消息
deptProducer.sendDeptRefreshMessage(); deptProducer.sendDeptRefreshMessage();
} }
public static void main(String[] args) {
String words = "创盈云>测试删除1";
System.out.println("原始字符串是'" + words + "'");
System.out.println("replace(\"r's\",\"is\")结果：" + words.replace("测试删除1", "测试删除"));
}
@Override @Override
public void deleteDept(Long id) { public void deleteDept(Long id) {
// 校验是否存在 // 校验是否存在