diff --git a/src/main/java/io/v/nutz/wakershome/mobile/MWakesHomeReviewController.java b/src/main/java/io/v/nutz/wakershome/mobile/MWakesHomeReviewController.java
index 4b22f69..0b7b86a 100644
--- a/src/main/java/io/v/nutz/wakershome/mobile/MWakesHomeReviewController.java
+++ b/src/main/java/io/v/nutz/wakershome/mobile/MWakesHomeReviewController.java
@@ -109,7 +109,7 @@ public class MWakesHomeReviewController {
             if (reviewMode && v.getInt("commentTarget") == 1) {
                 //校工会自评，判断有没有校工会管理员的权限
                 v.put("canJoin", ShiroUtil.hasRole("A06"));
-            } else if (reviewMode && v.getInt("commentTarget") == 2){
+            } else if (reviewMode && v.getInt("commentTarget") == 2) {
                 //分工会自评，判断有没有分工会管理员
                 v.put("canJoin", ShiroUtil.hasRole("H04"));
             }
@@ -220,7 +220,7 @@ public class MWakesHomeReviewController {
                     """).setParam("zbId", id).setParam("userId", ShiroUtil.getPrincipalProperty("id"));
             List<NutMap> list = baseService.listMap(sql);
             NutMap nutMap = list.stream().findFirst().orElse(null);
-            if (Strings.isNotBlank(nutMap.getString("commentTarget")) && "1".equals(nutMap.getString("assessmentMode"))) {
+            if (nutMap != null && Strings.isNotBlank(nutMap.getString("commentTarget")) && "1".equals(nutMap.getString("assessmentMode"))) {
                 return Result.success().addData(1);
             } else {
                 return Result.success().addData(0);
diff --git a/src/main/java/io/v/nutz/wakershome/model/review/CommentBz.java b/src/main/java/io/v/nutz/wakershome/model/review/CommentBz.java
index f8add2a..179ea37 100644
--- a/src/main/java/io/v/nutz/wakershome/model/review/CommentBz.java
+++ b/src/main/java/io/v/nutz/wakershome/model/review/CommentBz.java
@@ -78,9 +78,6 @@ public class CommentBz extends BaseModel {
 
     @Column
     @Comment("排序字段")
-    @Prev({
-            @SQL(db = DB.MYSQL, value = "SELECT IFNULL(MAX(location),0)+1 FROM comment_bz"),
-    })
     private Integer location;
 
     @Column
diff --git a/src/main/java/io/v/nutz/wakershome/model/review/CommentNr.java b/src/main/java/io/v/nutz/wakershome/model/review/CommentNr.java
index 395f1a9..65df940 100644
--- a/src/main/java/io/v/nutz/wakershome/model/review/CommentNr.java
+++ b/src/main/java/io/v/nutz/wakershome/model/review/CommentNr.java
@@ -49,9 +49,6 @@ public class CommentNr extends BaseModel {
 
     @Column
     @Comment("排序字段")
-    @Prev({
-            @SQL(db= DB.MYSQL,value = "SELECT IFNULL(MAX(location),0)+1 FROM comment_nr"),
-    })
     private Integer location;
 
     @Column
diff --git a/src/main/java/io/v/nutz/wakershome/model/review/CommentZb.java b/src/main/java/io/v/nutz/wakershome/model/review/CommentZb.java
index 74e08e5..e115572 100644
--- a/src/main/java/io/v/nutz/wakershome/model/review/CommentZb.java
+++ b/src/main/java/io/v/nutz/wakershome/model/review/CommentZb.java
@@ -66,9 +66,6 @@ public class CommentZb extends BaseModel {
 
     @Column
     @Comment("排序字段")
-    @Prev({
-            @SQL(db= DB.MYSQL,value = "SELECT IFNULL(MAX(location),0)+1 FROM comment_zb"),
-    })
     private Integer location;
 
 
diff --git a/src/main/java/io/v/nutz/wakershome/service/impl/review/CommentZbServiceImpl.java b/src/main/java/io/v/nutz/wakershome/service/impl/review/CommentZbServiceImpl.java
index 240b592..5e6615e 100644
--- a/src/main/java/io/v/nutz/wakershome/service/impl/review/CommentZbServiceImpl.java
+++ b/src/main/java/io/v/nutz/wakershome/service/impl/review/CommentZbServiceImpl.java
@@ -2,6 +2,7 @@ package io.v.nutz.wakershome.service.impl.review;
 
 import cn.hutool.core.util.StrUtil;
 import io.v.nutz.service.impl.ViServiceImpl;
+import io.v.nutz.wakershome.model.review.CommentBz;
 import io.v.nutz.wakershome.model.review.CommentNr;
 import io.v.nutz.wakershome.model.review.CommentZb;
 import io.v.nutz.wakershome.service.review.CommentNrService;
@@ -40,8 +41,15 @@ public class CommentZbServiceImpl extends ViServiceImpl<CommentZb> implements Co
         if (StrUtil.isBlank(zbid)) {
             return null;
         }
-        CommentZb zb = fetchLinks(fetch(zbid), "nrs", Cnd.NEW().asc("location"));
-        setNrBz(zb.getNrs());
+
+        CommentZb zb = dao().fetchLinks(fetch(zbid), "nrs");
+        for (CommentNr nr : zb.getNrs()) {
+            List<CommentBz> query = dao().query(CommentBz.class, Cnd.where("zb_id", "=", zbid).and("nr_id", "=", nr.getId()).asc("contentNumber"));
+            nr.setBzs(query);
+        }
+
+//        CommentZb zb = fetchLinks(fetch(zbid), "nrs", Cnd.NEW().asc("contentNumber"));
+//        setNrBz(zb.getNrs());
         return zb;
     }
 
diff --git a/src/main/resources/static/components/wakeshome/review/ReviewResult.vue b/src/main/resources/static/components/wakeshome/review/ReviewResult.vue
index 57b57e9..4d66c39 100644
--- a/src/main/resources/static/components/wakeshome/review/ReviewResult.vue
+++ b/src/main/resources/static/components/wakeshome/review/ReviewResult.vue
@@ -81,7 +81,8 @@
 
     <template v-if="viewInfo.zbxx.scoringMode === 1 && viewInfo.zbxx.reviewMode === 1">
       <vi-title title="职工评家总结"></vi-title>
-      <file-upload :files.sync="viewInfo.commentPeo.files" view></file-upload>
+      <file-upload v-if="viewInfo.commentPeo.files && viewInfo.commentPeo.files.length > 0" :files.sync="viewInfo.commentPeo.files" view></file-upload>
+      <el-empty v-else :image-size="100" description="未上传总结"></el-empty>
     </template>
 
   </el-form>
diff --git a/src/main/resources/static/components/wakeshome/review/UnionCommentZb.vue b/src/main/resources/static/components/wakeshome/review/UnionCommentZb.vue
index fef300d..0ad8012 100644
--- a/src/main/resources/static/components/wakeshome/review/UnionCommentZb.vue
+++ b/src/main/resources/static/components/wakeshome/review/UnionCommentZb.vue
@@ -159,139 +159,106 @@
 
     <vi-title2 title="测评内容"></vi-title2>
 
-    <el-form-item label="" label-width="0" v-for="(nr,idx) in data.nrs">
+      <el-form-item label="" label-width="0" v-for="(nr,idx) in data.nrs">
 
-      <el-row type="flex" align="middle" justify="space-between">
-        <el-input v-model="nr.content" :disabled="is_view" maxlength="30" style="width: 50%"
-                  placeholder="请填写测评内容">
-          <template slot="prepend"><span>
-            {{ nr.contentNumber = idx + 1 }}</span></template>
-        </el-input>
-        <el-button v-if="!is_view" size="medium" :disabled="data.nrs.length<=1" type="danger"
-                   @click="data.nrs.splice(idx,1)"
-                   icon="el-icon-delete"></el-button>
+            <el-row type="flex" align="middle" justify="space-between">
+              <el-input v-model="nr.content" :disabled="is_view" maxlength="30" style="width: 50%"
+                        placeholder="请填写测评内容">
+                <template slot="prepend"><span>
+              {{ nr.contentNumber = idx + 1 }}</span></template>
+              </el-input>
+              <el-button v-if="!is_view" size="medium" :disabled="data.nrs.length<=1" type="danger"
+                         @click="data.nrs.splice(idx,1)"
+                         icon="el-icon-delete"></el-button>
+            </el-row>
+
+          <el-row style="margin-top: 20px">
+            <el-table :data="nr.bzs" style="width: 100%" border show-summary
+                      :summary-method="getSummaries" size="small">
+              <el-table-column align="center" header-align="center" label="序号" type="index"
+                               width="100px">
+                <template scope="{$index,row}">
+                  {{ row.contentNumber = $index + 1 }}
+                </template>
+              </el-table-column>
+
+              <el-table-column label="测评标准" prop="inspection">
+                <template scope="{row}">
+                  <el-input v-if="!is_view" v-model="row.inspection" placeholder="请填写测评标准" type="textarea"
+                            rows="2"></el-input>
+                  <div v-else style="white-space:break-spaces">{{ row.inspection }}</div>
+                </template>
+              </el-table-column>
+
+              <!--          <el-table-column label="单项分" prop="single_score" header-align="center" align="center" width="100px">
+                          <template scope="{row}">
+                            <el-input v-if="!is_view" v-model="row.single_score" placeholder="请填写单项分"></el-input>
+                            <span v-else>{{ row.single_score }}</span>
+                          </template>
+                        </el-table-column>-->
+
+              <el-table-column label="标准分" prop="score" header-align="center" align="center"
+                               width="100px" v-if="data.scoringMode===1">
+                <template scope="{row}">
+                  <el-input v-if="!is_view" v-model.number="row.score" maxlength="4"
+                            placeholder="请填写标准分"></el-input>
+                  <span v-else>{{ row.score }}</span>
+                </template>
+              </el-table-column>
+
+              <!--          <el-table-column label="能否超过标准分" prop="beyond_highestscore" header-align="center" align="center" width="120px">
+                          <template scope="{row}">
+                            <el-switch
+                                v-if="!is_view"
+                                v-model="row.beyond_highestscore"
+                                active-color="#13ce66"
+                                inactive-color="#ff4949">
+                            </el-switch>
+                            <el-switch
+                                v-else
+                                disabled
+                                v-model="row.beyond_highestscore">
+                            </el-switch>
+                          </template>
+                        </el-table-column>-->
+
+              <el-table-column label="是否填写意见" prop="isEvidence" header-align="center" align="center"
+                               width="120px" v-if="data.scoringMode===1">
+                <template scope="{row}">
+                  <el-switch
+                      :disabled="is_view"
+                      v-model="row.isEvidence"
+                      active-color="#13ce66"
+                      inactive-color="#ff4949">
+                  </el-switch>
+                </template>
+              </el-table-column>
+
+              <el-table-column v-if="!is_view" label="操作" header-align="center" align="center"
+                               width="200px">
+                <template scope="{row,$index}">
+                  <el-button size="mini" :disabled="nr.bzs.length<=1 || (!row.canDelete && row.id)"
+                             type="danger" icon="el-icon-delete"
+                             @click="nr.bzs.splice($index,1)"></el-button>
+                  <el-button size="mini"
+                             type="primary" icon="el-icon-plus"
+                             @click="nr.bzs.splice($index+1,0,{inspection:null,score:null,isEvidence:true})"></el-button>
+                </template>
+              </el-table-column>
+            </el-table>
+          </el-row>
+
+          <el-row class="mt10 mb10" style="border-top: 1px dashed rgb(229, 225, 225)"></el-row>
+      </el-form-item>
+
+      <el-row type="flex" justify="center">
+        <el-button v-if="!is_view"
+                   type="primary"
+                   @click="data.nrs.push({bzs:[{inspection:null,score:null,isEvidence:true}]})">
+          添加测评内容
+        </el-button>
       </el-row>
 
-      <el-row style="margin-top: 20px">
-        <el-table :data="nr.bzs" style="width: 100%" border show-summary
-                  :summary-method="getSummaries" size="small">
-          <el-table-column align="center" header-align="center" label="序号" type="index"
-                           width="100px">
-            <template scope="{$index,row}">
-              {{ row.contentNumber = $index + 1 }}
-            </template>
-          </el-table-column>
-
-          <el-table-column label="测评标准" prop="inspection" >
-            <template scope="{row}">
-              <el-input v-if="!is_view" v-model="row.inspection" placeholder="请填写测评标准" type="textarea" rows="4"></el-input>
-              <div v-else style="white-space:break-spaces">{{ row.inspection }}</div>
-            </template>
-          </el-table-column>
-
-          <!--          <el-table-column label="单项分" prop="single_score" header-align="center" align="center" width="100px">
-                      <template scope="{row}">
-                        <el-input v-if="!is_view" v-model="row.single_score" placeholder="请填写单项分"></el-input>
-                        <span v-else>{{ row.single_score }}</span>
-                      </template>
-                    </el-table-column>-->
-
-          <el-table-column label="标准分" prop="score" header-align="center" align="center"
-                           width="100px" v-if="data.scoringMode===1">
-            <template scope="{row}">
-              <el-input v-if="!is_view" v-model.number="row.score" maxlength="4"
-                        placeholder="请填写标准分"></el-input>
-              <span v-else>{{ row.score }}</span>
-            </template>
-          </el-table-column>
-
-          <!--          <el-table-column label="能否超过标准分" prop="beyond_highestscore" header-align="center" align="center" width="120px">
-                      <template scope="{row}">
-                        <el-switch
-                            v-if="!is_view"
-                            v-model="row.beyond_highestscore"
-                            active-color="#13ce66"
-                            inactive-color="#ff4949">
-                        </el-switch>
-                        <el-switch
-                            v-else
-                            disabled
-                            v-model="row.beyond_highestscore">
-                        </el-switch>
-                      </template>
-                    </el-table-column>-->
-
-          <el-table-column label="是否填写意见" prop="isEvidence" header-align="center" align="center"
-                           width="120px" v-if="data.scoringMode===1">
-            <template scope="{row}">
-              <el-switch
-                  :disabled="is_view"
-                  v-model="row.isEvidence"
-                  active-color="#13ce66"
-                  inactive-color="#ff4949">
-              </el-switch>
-            </template>
-          </el-table-column>
-
-          <!--
-                    <el-table-column label="关联模块" prop="associatedmodule" header-align="center" align="center" width="200px">
-                      <template scope="{row}">
-                        <el-input v-if="!is_view" v-model="row.associatedmodule" maxlength="10" placeholder="请填写关联模块"></el-input>
-                        <span v-else>{{ row.associatedmodule }}</span>
-                      </template>
-                    </el-table-column>
-
-                    <el-table-column label="关联标识" prop="bz_relation_id" header-align="center" align="center" width="100px">
-                      <template scope="{row}">
-                        <el-input v-if="!is_view" v-model="row.bz_relation_id" maxlength="20" placeholder="请填写关联标识,该标识唯一"></el-input>
-                        <span v-else>{{ row.bz_relation_id }}</span>
-                      </template>
-                    </el-table-column>
-          -->
-
-          <!--          <el-table-column label="能否删除" prop="canDelete" header-align="center" align="center" width="100px">-->
-          <!--            <template scope="{row}">-->
-          <!--              <el-switch-->
-          <!--                  v-if="!is_view"-->
-          <!--                  :disabled="row.canDelete==false"-->
-          <!--                  v-model="row.canDelete"-->
-          <!--                  active-color="#13ce66"-->
-          <!--                  inactive-color="#ff4949">-->
-          <!--              </el-switch>-->
-          <!--              <el-switch-->
-          <!--                  v-else-->
-          <!--                  :disabled="!row.canDelete && row.id"-->
-          <!--                  v-model="row.canDelete">-->
-          <!--              </el-switch>-->
-          <!--            </template>-->
-          <!--          </el-table-column>-->
-
-          <el-table-column v-if="!is_view" label="操作" header-align="center" align="center"
-                           width="200px">
-            <template scope="{row,$index}">
-              <el-button size="mini" :disabled="nr.bzs.length<=1 || (!row.canDelete && row.id)"
-                         type="danger" icon="el-icon-delete"
-                         @click="nr.bzs.splice($index,1)"></el-button>
-              <el-button size="mini"
-                         type="primary" icon="el-icon-plus"
-                         @click="nr.bzs.splice($index+1,0,{inspection:null,score:null,isEvidence:true})"></el-button>
-            </template>
-          </el-table-column>
-        </el-table>
-      </el-row>
-
-      <el-row class="mt10 mb10" style="border-top: 1px dashed rgb(229, 225, 225)"></el-row>
-    </el-form-item>
-
-    <el-row type="flex" justify="center">
-      <el-button v-if="!is_view"
-                 type="primary"
-                 @click="data.nrs.push({bzs:[{inspection:null,score:null,isEvidence:true}]})">
-        添加测评内容
-      </el-button>
-    </el-row>
-
-
     <div>
 
       <drawer-user-scope
@@ -303,10 +270,8 @@
 
   </el-form>
 
-
 </template>
 
-
 <script>
 
 const METHOD_NAME = "change"
diff --git a/src/main/resources/views/platform/wakeshome/review/doReview.html b/src/main/resources/views/platform/wakeshome/review/doReview.html
index 3386f65..67a5b14 100644
--- a/src/main/resources/views/platform/wakeshome/review/doReview.html
+++ b/src/main/resources/views/platform/wakeshome/review/doReview.html
@@ -164,7 +164,7 @@ layout("/layouts/platform.html"){
                                              align="center">
                                 <template scope="{row}">
                                     <el-input v-model="row.inspection"
-                                              readonly type="textarea" rows="4"></el-input>
+                                              readonly type="textarea" rows="2"></el-input>
                                 </template>
                             </el-table-column>
 
@@ -286,7 +286,7 @@ layout("/layouts/platform.html"){
             'union-comment-zb': httpVueLoader('/components/wakeshome/review/UnionCommentZb.vue?v=' + moment(new Date()).unix()),
             'wakes-home-review': httpVueLoader('/components/wakeshome/review/ReviewResult.vue?v=' + moment(new Date()).unix()),
         },
-        methods: async {
+        methods: {
             async openReview(row){
                 const resp = await $.get(loc() + "/getPeoId",{id:row.id})
                 if (resp.code === 0) {
@@ -376,7 +376,7 @@ layout("/layouts/platform.html"){
                         bzList.push(o)
                     })
                 })
-                this.formData.bzList = JSON.stringify(bzList)
+                this.formData.bzList = bzList
                 this.formData.id = this.id
                 this.formData.president = this.president
                 this.formData.files = JSON.stringify(this.formData.files)
@@ -396,12 +396,15 @@ layout("/layouts/platform.html"){
                     if (!this.formData.reviewResult) {
                         await this.createdReviewResult()
                     }
+                    this.formData.bzList = JSON.stringify(this.formData.bzList)
                     const resp = await $.post('/mobile/wakeshome/review/appraisal/doSubmit',this.formData)
                     if (resp.code === 0) {
                         this.$message.success('提交成功')
                         this.$refs.guava.index()
                         this.formData = {}
                         this.pageData()
+                    } else {
+                        this.$message.warning(resp.msg)
                     }
                 })
 
@@ -437,8 +440,6 @@ layout("/layouts/platform.html"){
                     this.formData.evaluatedPersonName = user.username
                     this.formData.evaluatedPersonType = user.evaluatedPersonType
                 }
-
-                this.formData.bzList = JSON.stringify(this.formData.bzList)
             },
         },
         async created() {
diff --git a/src/main/resources/views/platform/wakeshome/review/khzb.html b/src/main/resources/views/platform/wakeshome/review/khzb.html
index a6cecaf..399cd7e 100644
--- a/src/main/resources/views/platform/wakeshome/review/khzb.html
+++ b/src/main/resources/views/platform/wakeshome/review/khzb.html
@@ -88,7 +88,6 @@ layout("/layouts/platform.html"){
         </template>
 
         <template #view>
-
             <union-comment-zb :data="viewData" :is_view="true"></union-comment-zb>
         </template>
     </guava>