Browse Source

修复设备管理展示bug370

oyq28 3 years ago
parent
commit
5626729901

+ 1 - 0
imcs-admin-boot/imcs-business-biz/src/main/java/com/github/zuihou/business/productionResourceCenter/service/impl/OtherNodeServiceImpl.java

@@ -67,6 +67,7 @@ public class OtherNodeServiceImpl implements NodeOperationService {
     public void initResource(TaskNode taskNode, TTask task, Map dataMap) {
         String moduleName = dataMap.get("moduleName") == null ? "" : dataMap.get("moduleName").toString();
         if(StringUtil.isNotEmpty(moduleName)) {
+            //
             List<Module> modules = moduleService.list(new QueryWrapper<Module>().like("name", moduleName));
             if(modules.size()>0){
                 //设备关联接驳位

+ 4 - 1
imcs-admin-boot/imcs-tenant-biz/src/main/resources/mapper_tenant/base/defaults/ProductionresourceviewMapper.xml

@@ -23,6 +23,7 @@
             v.production_no  productionNo,
             v.manufacturer,
             v.is_auto_code isAutoCode,
+            v.display_status displayStatus,
             v.program_syn_time programSynTime,
             v.program_num programNum,
             pic,
@@ -88,13 +89,15 @@
         <if test="id != null and id != ''">
             and v.id = #{id}
         </if>
+        <if test="displayStatus != null and displayStatus != ''">
+            and v.display_status = #{displayStatus}
+        </if>
         <if test="isAutoCode != null and isAutoCode != ''">
             and v.is_auto_code = #{isAutoCode}
         </if>
         <if test="current != null">
             limit  ${current},${size}
         </if>
-
     </select>