WL/laws_weilai
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master'

Browse Source
This commit is contained in:
wangzhijiang
2022-04-18 11:29:21 +08:00
parent 154e523879 6161fa1fff
commit 574e7f5529
5 changed files with 46 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectLibraryBaseServiceImpl.java
+11 -7
View File
@@ -148,8 +148,8 @@ public class ProjectLibraryBaseServiceImpl extends ServiceImpl<ProjectLibraryBas
String certificationEngineerId = projectLibraryBase.getCertificationEngineer();
String certificationEngineerName=null;
String certificationEngineerEnName=null;
StringBuilder name=new StringBuilder();
StringBuilder enName=new StringBuilder();
StringBuilder certificationName=new StringBuilder();
for (String data:certificationEngineerIdList){
if (StringUtils.isNotEmpty(certificationEngineerId)) {
certificationEngineerName = sysUsers.stream().filter(e -> data.equals(e.getId()))
@@ -158,13 +158,17 @@ public class ProjectLibraryBaseServiceImpl extends ServiceImpl<ProjectLibraryBas
.map(sysUser -> sysUser.getUsername()).collect(Collectors.joining(","));
}
name.append(certificationEngineerName).append(" ");
enName.append(certificationEngineerEnName).append(" ");
certificationName.append(certificationEngineerName).append("(").append(certificationEngineerEnName).append(")").append(" ");
}
projectLibraryBase.setCertificationEngineerName(name.toString());
projectLibraryBase.setCertificationEngineerEnName(enName.toString());
projectLibraryBase.setCertificationEngineerName(certificationName.toString());
}
}
StringBuilder studioCnName= new StringBuilder(projectLibraryBase.getStudioEngineerName());
StringBuilder studioEnName= new StringBuilder(projectLibraryBase.getStudioEngineerEnName());
String studioName = studioCnName.append("(").append(studioEnName).append(")").toString();
projectLibraryBase.setStudioEngineerName(studioName);
}
}
jero-boot/jero-boot-modules/src/main/java/com/jero/modules/tag/controller/OnlCgformTagController.java
+1
View File
@@ -66,6 +66,7 @@ public class OnlCgformTagController extends JeroController<OnlCgformTag, IOnlCgf
*/
@AutoLog(value = "标签管理-分页列表查询")
@ApiOperation(value="标签管理-分页列表查询", notes="标签管理-分页列表查询")
@RequiresPermissions("tag:page")
@PostMapping(value = "/page")
public Result<?> queryPageList(@RequestBody Map<String,Object> params) {
IPage<OnlCgformTag> pageList= onlCgformTagService.queryPageList(params);