首件计划名称重复和登录权限问题

application-facade/src/main/java/com/factory/web/service/impl/fa/FirstArticleServiceImpl.java

@@ -429,7 +429,7 @@ public class FirstArticleServiceImpl extends ServiceImpl<FirstArticleMapper, Ben
             }
             if (!req.getBentelerPlanName().equals(oldPlan.getName())) {
                 // 校验计划名称是否存在
-                if (this.checkPlanNameExist(req.getBentelerPlanName(), oldPlan.getId())) {
+                if (this.checkPlanNameExist(req.getBentelerPlanName(), oldPlan.getOriginalId())) {
                     return ResponseBeanBuilder.fail("计划名称已存在");
                 }
             }

common-user/src/main/java/com/factory/user/service/impl/TokenServiceImpl.java

@@ -17,6 +17,8 @@ import com.factory.user.mapper.RolePermissionsMapper;
 import com.factory.user.mapper.UserRolesMapper;
 import com.factory.user.service.TokenService;
 import com.factory.user.util.AESUtil;
+import com.itextpdf.xmp.impl.Base64;
+
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.data.redis.core.RedisTemplate;
@@ -120,8 +122,14 @@ public class TokenServiceImpl implements TokenService {
                 userRolesMapper.selectList(Wrappers.<UserRole>lambdaQuery().eq(UserRole::getUserId, userId));
         List<Long> roleIdList = userRoles.stream().map(UserRole::getRoleId).collect(Collectors.toList());
         if (!CollectionUtils.isEmpty(roleIdList)) {
-            if (roleIdList.contains(RemoteCommonConstants.ROLE_ADMIN)) {
+            if (roleIdList.contains(RemoteCommonConstants.ROLE_ADMIN)) {//管理员
                 return RemoteCommonConstants.NOT_DEL;
+            }else if(TokenType.SHORT_EXPIRED_TOKEN.toString().equals(client)&&url.equalsIgnoreCase("login")) {
+            	if(roleIdList.contains(2L)) {//质量工程师可以登录WEB
+            		 return RemoteCommonConstants.NOT_DEL;
+            	}else {
+            		 return Integer.valueOf(ResponseEnum.USER_NOT_PERMISSION.getStatus());
+            	}
             }
             List<RolePermission> rolePermissions = rolePermissionsMapper.selectList(Wrappers.<RolePermission>lambdaQuery().in(RolePermission::getRoleId, roleIdList));
             List<Long> permissionIds = rolePermissions.stream().map(RolePermission::getPermissionId).collect(Collectors.toList());
@@ -136,4 +144,7 @@ public class TokenServiceImpl implements TokenService {
         return Integer.valueOf(ResponseEnum.USER_NOT_PERMISSION.getStatus());
     }
 
+    public static void main(String[] args) {
+    	System.out.println(Base64.decode("YmVudGVsZXIuY29t"));
+    }
 }