禅道bug修改。

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

@@ -684,7 +684,7 @@ public class SysPermissionController {
 			//项目参数任务
 			if(StringUtils.equals(permission.getId(), SysPermissionEnum.PROJECT_PARAMETER_TASKS.getId())){
 				boolean existTaskFlag = false;
-				existTaskFlag = sysPermissionService.judgeToDo();
+//				existTaskFlag = sysPermissionService.judgeToDo();
 				meta.put("existTask",existTaskFlag);
 			}
 			json.put("meta", meta);

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

@@ -6,6 +6,8 @@ public enum RoleEnum {
     COUNTRU_CARD_MANAGE("countryCard管理员","countryCardManage","countryCardManage","1564916346120916993",4),
     ENGINEERING_INTERFACE_PERSON("工程接口人","engineeringInterfacePerson","engineeringInterfacePerson","1534020084667674626",5),
     ENGINEER("工程师","engineer","engineer","1534020318437208065",6),
+    HOMOLOGATION_ENGINEER("认证工程师","homologationEngineer","homologationEngineer","1534019729326239745",8),
+    REGULATION_OWNER("法规工程师","regulationOwner","regulationOwner","1534021004067500034",7),
     ;
 
     String name;

jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/service/ISysUserService.java

@@ -289,4 +289,16 @@ public interface ISysUserService extends IService<SysUser> {
 	 * @return
 	 */
 	boolean isEngineer(LoginUser currentUser);
+
+	/**
+	 * 验证当前登录用户是否是认证工程师角色
+	 * @return
+	 */
+	boolean isHomologationEngineer(LoginUser currentUser);
+
+	/**
+	 * 验证当前登录用户是否是法规工程师角色
+	 * @return
+	 */
+	boolean isRegulationOwner(LoginUser currentUser);
 }

jero-boot/jero-boot-module-system/src/main/java/com/jero/modules/system/service/impl/SysUserServiceImpl.java

@@ -656,4 +656,46 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> impl
 		}
 		return result;
 	}
+
+	@Override
+	public boolean isHomologationEngineer(LoginUser currentUser) {
+		boolean result = false;
+		RoleEnum engineer = RoleEnum.HOMOLOGATION_ENGINEER;
+		List<SysUserRole> userRoleList = this.sysUserRoleMapper.selectList(new QueryWrapper<SysUserRole>().lambda().eq(SysUserRole::getUserId, currentUser.getId()));
+		if(CollectionUtils.isNotEmpty(userRoleList)){
+			List<SysUserRole> userRoles = userRoleList.stream().filter(userRole -> {
+				boolean flag = false;
+				if(StringUtils.equals(userRole.getRoleId(),engineer.getId())){
+					flag = true;
+				}
+				return flag;
+			}).collect(Collectors.toList());
+
+			if(CollectionUtils.isNotEmpty(userRoles)){
+				result = true;
+			}
+		}
+		return result;
+	}
+
+	@Override
+	public boolean isRegulationOwner(LoginUser currentUser) {
+		boolean result = false;
+		RoleEnum engineer = RoleEnum.REGULATION_OWNER;
+		List<SysUserRole> userRoleList = this.sysUserRoleMapper.selectList(new QueryWrapper<SysUserRole>().lambda().eq(SysUserRole::getUserId, currentUser.getId()));
+		if(CollectionUtils.isNotEmpty(userRoleList)){
+			List<SysUserRole> userRoles = userRoleList.stream().filter(userRole -> {
+				boolean flag = false;
+				if(StringUtils.equals(userRole.getRoleId(),engineer.getId())){
+					flag = true;
+				}
+				return flag;
+			}).collect(Collectors.toList());
+
+			if(CollectionUtils.isNotEmpty(userRoles)){
+				result = true;
+			}
+		}
+		return result;
+	}
 }