修改字典错别字，角色管理添加搜索条件，调整工程部署页面，管道节点管理表单取消数据表为必填项

zkqy-common/src/main/java/com/zkqy/common/core/domain/entity/SysDictType.java

@@ -58,7 +58,7 @@ public class SysDictType extends BaseEntity
 
     @NotBlank(message = "字典类型不能为空")
     @Size(min = 0, max = 100, message = "字典类型类型长度不能超过100个字符")
-    @Pattern(regexp = "^[a-z][a-z0-9_]*$", message = "字典类型必须以字母开头，且只能为（小写字母，数字，下滑线）")
+    @Pattern(regexp = "^[a-z][a-z0-9_]*$", message = "字典类型必须以字母开头，且只能为（小写字母，数字，下划线）")
     public String getDictType()
     {
         return dictType;

zkqy-system/src/main/resources/mapper/system/SysRoleMapper.xml

@@ -57,6 +57,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 		<if test="tenantId != null and tenantId != 0">
 			AND r.tenant_id = #{tenantId}
 		</if>
+		<if test="tenantId == null">
+			and r.tenant_id is null
+		</if>
+		<if test="tenantName != null and tenantName != ''">
+			and t.tenant_name like concat('%', #{tenantName}, '%')
+		</if>
 		<!-- 数据范围过滤 -->
 		${params.dataScope}
 		order by r.role_sort

zkqy-ui/src/views/bpmprocess/scriptManage.vue

@@ -393,9 +393,9 @@ export default {
         industryType: [
           { required: true, message: "请选择脚本类型", trigger: "change" },
         ],
-        tableName: [
-          { required: true, message: "请选择数据表", trigger: "change" },
-        ],
+        // tableName: [
+        //   { required: true, message: "请选择数据表", trigger: "change" },
+        // ],
       },
 
       // 代码编辑器相关数据

zkqy-ui/src/views/system/engineeringManage/index.vue

@@ -1,6 +1,6 @@
 <template>
   <div class="app-container">
-    <el-form
+    <!-- <el-form
       :model="queryParams"
       ref="queryForm"
       size="small"
@@ -36,10 +36,10 @@
           >重置
         </el-button>
       </el-form-item>
-    </el-form>
+    </el-form> -->
 
     <el-row :gutter="10" class="mb8">
-      <el-col :span="1.5">
+      <!-- <el-col :span="1.5">
         <el-button
           type="primary"
           plain
@@ -84,10 +84,10 @@
           v-hasPermi="['system:engineering:export']"
           >导出
         </el-button>
-      </el-col>
+      </el-col> -->
       <el-col :span="1.5">
         <el-button
-          type="info"
+          type="primary"
           plain
           icon="el-icon-download"
           size="mini"
@@ -108,26 +108,25 @@
       @selection-change="handleSelectionChange"
     >
       <el-table-column type="selection" width="55" align="center" />
-      <el-table-column label="编号" align="center" prop="id" />
+      <!-- <el-table-column label="编号" align="center" prop="id" /> -->
       <!-- <el-table-column label="工程key" align="center" prop="engineeringKey" /> -->
       <el-table-column label="工程名称" align="center" prop="engineeringName" />
-      <el-table-column label="下载次数" align="center" prop="downloadNumber" />
+      <!-- <el-table-column label="下载次数" align="center" prop="downloadNumber" /> -->
       <el-table-column
         label="下载时间"
         align="center"
         prop="downloadTime"
-        width="180"
       >
         <template slot-scope="scope">
           <span>{{ parseTime(scope.row.downloadTime, "{y}-{m}-{d}") }}</span>
         </template>
       </el-table-column>
-      <el-table-column label="更新时间" align="center" prop="updateTime" />
+      <!-- <el-table-column label="更新时间" align="center" prop="updateTime" /> -->
       <!-- <el-table-column label="租户编号" align="center" prop="tenantId" />
       <el-table-column label="备注" align="center" prop="remark" />
       <el-table-column label="创建者ID" align="center" prop="createById" />
       <el-table-column label="更新者ID" align="center" prop="updateById" /> -->
-      <el-table-column
+      <!-- <el-table-column
         label="操作"
         align="center"
         class-name="small-padding fixed-width"
@@ -161,7 +160,7 @@
             </el-dropdown-menu>
           </el-dropdown>
         </template>
-      </el-table-column>
+      </el-table-column> -->
     </el-table>
 
     <pagination