Browse Source

Merge branch 'test' of jishutao/kede-server into prod

anderx 2 years ago
parent
commit
c51caa43cb
1 changed files with 6 additions and 1 deletions
  1. 6 1
      src/main/java/com/goafanti/RD/service/impl/RDServiceImpl.java

+ 6 - 1
src/main/java/com/goafanti/RD/service/impl/RDServiceImpl.java

@@ -137,7 +137,7 @@ public class RDServiceImpl extends BaseMybatisDao<RdDetailsMapper> implements RD
                         OkCount--;
                         errors.add(String.format("%s.数据第%s行,项目名称[%s]数据异常!",erCount,errorsCount,in.getRdName()));
                     }
-                }else {
+                }else if (details.getAid().equals(TokenManager.getAdminId())) {
                     try {
                         in.setId(details.getId());
                         rdDetailsMapper.updateByPrimaryKeySelective(in);
@@ -147,6 +147,11 @@ public class RDServiceImpl extends BaseMybatisDao<RdDetailsMapper> implements RD
                         OkCount--;
                         errors.add(String.format("%s.数据第%s行,项目名称[%s]数据更新异常!",erCount,errorsCount,in.getRdName()));
                     }
+                }else {
+                    int errorsCount=RdCount+3;
+                    erCount++;
+                    OkCount--;
+                    errors.add(String.format("%s.数据第%s行,公司名称[%s]项目名称[%s]已被其他管理员录入!",erCount,errorsCount,in.getUserName(),in.getRdName()));
                 }
             }
         }