ting.yin 6 سال پیش
والد
کامیت
7647e18e85
1فایلهای تغییر یافته به همراه7 افزوده شده و 5 حذف شده
  1. 7 5
      stmms-ms-admin/src/main/java/cn/com/qmth/stmms/ms/admin/api/UserApi.java

+ 7 - 5
stmms-ms-admin/src/main/java/cn/com/qmth/stmms/ms/admin/api/UserApi.java

@@ -51,11 +51,13 @@ public class UserApi {
     @RequestMapping(value = "{domain}", method = RequestMethod.PUT)
     public void update(@PathVariable MarkUser domain, @RequestBody MarkUser user) {
     	MarkSubject markSubject = markSubjectRepo.findOne(user.getWorkId() + "-" + user.getSubject().toString());
-        if (user.getWeight()-domain.getWeight()!=0 && !markSubject.getStage().equals(MarkStage.INIT)) {
-            throw new RuntimeException("请在分档阶段前修改权重");
-        }
-        if(domain.getRole().equals(Role.MARKER)&&!(user.getWeight()>=1)){
-        	throw new RuntimeException("评卷员权重必须大于1");
+        if(domain.getRole().equals(Role.MARKER)){
+        	if (user.getWeight()-domain.getWeight()!=0 && !markSubject.getStage().equals(MarkStage.INIT)) {
+        		throw new RuntimeException("请在分档阶段前修改权重");
+        	}
+        	if(!(user.getWeight()>=1)){
+        		throw new RuntimeException("评卷员权重必须大于1");
+        	}
         }
         domain.setName(user.getName());
         domain.setMarkRight(user.getMarkRight());