Merge remote-tracking branch 'origin/master'

jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/enums/FixedFieldEnum.java

@@ -5,7 +5,6 @@ public enum FixedFieldEnum {
     NON_FIXED_FIELD_ENUM("非固定字段","0"),
     FIXED_FIELD_ENUM("固定字段","1"),
     CONFIGURABLE_FIELD("字段固定，内部可配","2"),
-    SYS_DICT_SYSTEM("系统数据字典标志值","0"),
     ;
     String name;
     String value;

jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/enums/IsTagDict.java

@@ -0,0 +1,31 @@
+package com.jero.modules.enums;
+
+
+public enum IsTagDict {
+
+    SYS_DICT_SYSTEM("系统数据字典标志值","0"),
+    ;
+    String name;
+    String value;
+
+    private IsTagDict(String name, String value) {
+        this.name = name;
+        this.value = value;
+    }
+
+    public String getName() {
+        return name;
+    }
+
+    public void setName(String name) {
+        this.name = name;
+    }
+
+    public String getValue() {
+        return value;
+    }
+
+    public void setValue(String value) {
+        this.value = value;
+    }
+}

jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/controller/SysDictController.java

@@ -17,6 +17,7 @@ import com.jero.common.util.ImportExcelUtil;
 import com.jero.common.util.SqlInjectionUtil;
 import com.jero.common.util.oConvertUtils;
 import com.jero.modules.enums.FixedFieldEnum;
+import com.jero.modules.enums.IsTagDict;
 import com.jero.modules.system.entity.SysDict;
 import com.jero.modules.system.entity.SysDictItem;
 import com.jero.modules.system.entity.SysUser;
@@ -81,7 +82,7 @@ public class SysDictController {
 		Result<IPage<SysDict>> result = new Result<IPage<SysDict>>();
 		QueryWrapper<SysDict> queryWrapper = QueryGenerator.initQueryWrapper(sysDict, req.getParameterMap());
 		queryWrapper.eq("del_flag",CommonConstant.DEL_FLAG_0);
-		queryWrapper.eq("is_tag_dict",FixedFieldEnum.SYS_DICT_SYSTEM.getValue());
+		queryWrapper.eq("is_tag_dict", IsTagDict.SYS_DICT_SYSTEM.getValue());
 		Page<SysDict> page = new Page<SysDict>(pageNo, pageSize);
 		IPage<SysDict> pageList = sysDictService.page(page, queryWrapper);
 		log.debug("查询当前页："+pageList.getCurrent());
@@ -100,6 +101,7 @@ public class SysDictController {
 	 */
 	@AutoLog(value = "标签内容-分页列表查询")
 	@ApiOperation(value="标签内容-分页列表查询", notes="区域管理表-分页列表查询")
+	@RequiresPermissions("dict:tagDictPage")
 	@PostMapping(value = "/tagDictPage")
 	public Result<?> queryPageList(@RequestBody Map<String,Object> params) {
 		IPage<SysDict> pageList=sysDictService.queryPageList(params);

jero-boot/jero-boot-modules/src/main/java/com/jero/modules/project/service/impl/ProjectLibraryBaseServiceImpl.java

@@ -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 certificationName=new StringBuilder();
-					StringBuilder enName=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(" ");
+						certificationName.append(certificationEngineerName).append("(").append(certificationEngineerEnName).append(")").append(" ");
-						enName.append(certificationEngineerEnName).append(" ");
+
 					}
-					projectLibraryBase.setCertificationEngineerName(name.toString());
+					projectLibraryBase.setCertificationEngineerName(certificationName.toString());
-					projectLibraryBase.setCertificationEngineerEnName(enName.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

@@ -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);