修改

cloud-model/src/main/java/com/hssx/cloudmodel/service/impl/PowerServiceImpl.java

@@ -90,7 +90,7 @@ public class PowerServiceImpl extends ServiceImpl<PowerMapper, Power> implements
             Project pro = projectMapper.selectById(userVO.getProjectId());
             log.info("project=======>"+pro);
             log.info("user====>"+user);
-            if (pro.getManagerId() == user.getId()) {
+            if (pro.getManagerId().equals(user.getId())) {
                 //资产方管理员或者担任项目经理的人才可修改人员权限
                 if (null != userVO.getPowers()) {
                     List<Integer> powerTypes = ListUtil.convertIntegerIdsArrayToList(userVO.getPowers());

ys_vue/src/views/base/allocation.vue

@@ -56,11 +56,11 @@
                     <span v-else>已启用</span>
                 </template>
             </el-table-column>
-            <el-table-column label="操作" align="center" width="160" sortable>
+            <el-table-column label="操作" align="center" width="160">
                 <template slot-scope="scope">
-                    <el-button size="small" type="primary" @click="openEnable(scope.$index)" :disabled="scope.row.isUse == 1">启用</el-button>
-                    <el-button size="small" @click="showEdit(scope.$index, scope.row, scope.row.isUse == 1)">修改</el-button>
-                    <!-- <el-button type="danger" size="small">删除</el-button> -->
+                    <el-button size="small" v-if="scope.row.modelNo != null" type="primary" @click="openEnable(scope.$index)">启用</el-button>
+                    <!--  :disabled="scope.row.isUse == 1" -->
+                    <el-button size="small" :style="scope.row.modelNo!=null?'':'float:right;margin-right:6px'" @click="showEdit(scope.$index, scope.row, scope.row.isUse == 1)">修改</el-button>
                 </template>
             </el-table-column>
         </el-table>