问题修改

bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/back/controller/BackChangeController.java

@@ -36,14 +36,8 @@ public class BackChangeController extends BaseController {
     @ApiOperation(value = "获取添加设备详情")
     @GetMapping("/getDevDetailsInfo")
     public AjaxResult getDevDetailsInfo(BackCsDeviceDetails dto) {
-        try {
+        List<BackCsDeviceDetails> list = service.getDevDetailsInfo(dto);
-            startPage();
+        return AjaxResult.success(list);
-            List<BackCsDeviceDetails> list = service.getDevDetailsInfo(dto);
-            return AjaxResult.success(getDataTable(list));
-        } catch (Exception e) {
-            log.error("查询失败，请联系管理员:{}", e.getMessage());
-            return AjaxResult.error("查询失败，请联系管理员");
-        }
     }
 
     /**

bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/back/service/impl/BackChangeServiceImpl.java

@@ -165,7 +165,7 @@ public class BackChangeServiceImpl implements BackChangeService {
                 }
                 // 编码重复
                 String devCode = details.getDevCode();
-                if (StringUtils.isNotBlank(devCode) && devCodeSet.contains(devCode)) {
+                if (!devCode.equals("/") && StringUtils.isNotBlank(devCode) && devCodeSet.contains(devCode)) {
                     return AjaxResult.error("添加的列表中设备编号存在重复：" + devCode);
                 } else if (StringUtils.isNotBlank(devCode)) {
                     devCodeSet.add(devCode);

bonus-modules/bonus-material-mall/src/main/resources/mapper/material/back/BackChangeMapper.xml

@@ -138,15 +138,15 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         WHEN mt.level = 6 THEN CONCAT(mt5.type_name, '>', mt4.type_name, '>', mt3.type_name, '>',
         mt2.type_name,'>', mt1.type_name, '>', mt.type_name)
         ELSE mt.type_name
-        END             AS category,
+        END AS category,
-        mdi.device_name     AS typeName,
+        mdi.device_name AS typeName,
         mdi.item_type_model AS typeModelName,
-        mdi.manage_type     AS manageType,
+        mdi.manage_type AS manageType,
-        mdi.code            AS devCode,
+        mdi.code AS devCode,
-        mdi.device_count    AS useNum,
+        mdi.device_count AS useNum,
-        1                   AS devType,
+        1 AS devType,
-        mdi.type_id         AS typeId,
+        mdi.type_id AS typeId,
-        mdi.ma_id           AS id
+        mdi.ma_id AS id
         FROM ma_dev_info mdi
         LEFT JOIN cs_device_change_details cdc ON mdi.code = cdc.dev_code
         LEFT JOIN cs_device_change cd ON cd.id = cdc.change_id
@@ -157,7 +157,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         LEFT JOIN ma_type mt4 ON mt3.parent_id = mt4.type_id
         LEFT JOIN ma_type mt5 ON mt4.parent_id = mt5.type_id
         <where>
-            mdi.is_active = '1' and mdi.ma_status = 2  AND cdc.del_flag = '0'
+            mdi.is_active = '1' and mdi.ma_status = 2 AND cdc.del_flag = '0'
             <if test="typeName!=null and typeName!=''">
                 AND mdi.device_name like concat('%',#{typeName},'%')
             </if>
@@ -183,14 +183,14 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         UNION ALL
 
         SELECT CONCAT(tt4.type_name, '>', tt3.type_name, '>', tt2.type_name) as category,
-        tt1.type_name                                                 as typeName,
+        tt1.type_name as typeName,
-        tt.type_name                                                  as typeModelName,
+        tt.type_name as typeModelName,
-        tl.manage_mode                                                as manageType,
+        tl.manage_mode as manageType,
-        IFNULL(tl.tool_code,'/')                                      as devCode,
+        IFNULL(tl.tool_code,'/') as devCode,
-        IFNULL(tl.in_num, 0)                                          as useNum,
+        IFNULL(tl.in_num, 0) as useNum,
-        2                                                             as devType,
+        2 as devType,
-        tl.type_id                                                    as typeId,
+        tl.type_id as typeId,
-        tl.id                                                         as id
+        tl.id as id
         FROM tool_ledger tl
         LEFT JOIN cs_device_change_details cdc ON tl.tool_code = cdc.dev_code
         LEFT JOIN cs_device_change cd ON cd.id = cdc.change_id
@@ -222,18 +222,18 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             </if>
         </where>
         GROUP BY tl.tool_code
-
+        HAVING useNum &gt; 0
         UNION ALL
 
         SELECT CONCAT(tt4.type_name, '>', tt3.type_name, '>', tt2.type_name) as category,
-        tt1.type_name                                                 as typeName,
+        tt1.type_name as typeName,
-        tt.type_name                                                  as typeModelName,
+        tt.type_name as typeModelName,
-        tl.manage_mode                                                as manageType,
+        tl.manage_mode as manageType,
-        IFNULL(tl.tool_code,'/')                                      as devCode,
+        IFNULL(tl.tool_code,'/') as devCode,
-        IFNULL(tl.in_num, 0)                                          as useNum,
+        IFNULL(tl.in_num, 0) as useNum,
-        2                                                             as devType,
+        2 as devType,
-        tl.type_id                                                    as typeId,
+        tl.type_id as typeId,
-        tl.id                                                         as id
+        tl.id as id
         FROM tool_ledger tl
         LEFT JOIN cs_device_change_details cdc ON tl.type_id = cdc.dev_type_id
         LEFT JOIN cs_device_change cd ON cd.id = cdc.change_id
@@ -264,7 +264,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
                 AND cd.pro_code = #{proCode}
             </if>
         </where>
+
         GROUP BY tl.id
+        HAVING useNum &gt; 0
     </select>
 
     <select id="getMonthMaxOrderByDate" resultType="java.lang.Integer">

bonus-modules/bonus-material-mall/src/main/resources/mapper/material/devchange/MaDevInfoMapper.xml

@@ -479,8 +479,7 @@
 
     <select id="selectTotalDeviceCount" resultType="java.lang.Integer">
         SELECT COUNT(1)
-        FROM ma_dev_info d
+        FROM ma_dev_info WHERE  is_active = '1' and entry_status = '1'
-                 JOIN ma_type t ON d.type_id = t.type_id
     </select>
 
 </mapper>