Accept Merge Request #39: (dev-wxl -> master)

Merge Request: 提交最新代码

Created By: @万新亮
Accepted By: @万新亮
URL: https://chuanghaikeji.coding.net/p/smarCampus/d/repair_backend/git/merge/39?initial=true

src/main/java/com/repair/controller/RepairClassesSettingsController.java

@@ -635,6 +635,9 @@ public class RepairClassesSettingsController implements RepairClassesSettingsCon
                         datas.add(stringCellValue);
                     }
                 } else if (rowNum >= 4) {
+                    if(row.getCell(0)==null){
+                        continue;
+                    }
                     row.getCell(0).setCellType(CellType.STRING);
                     String UserName = row.getCell(0).getStringCellValue();
                     if(ObjectUtils.isEmpty(UserName)){

src/main/java/com/repair/services/impl/RepairUserServiceImpl.java

@@ -182,7 +182,8 @@ public class RepairUserServiceImpl extends ServiceImpl<RepairUserMapper, RepairU
         Page<AutoDispatchUserVo> page = new Page<>();
         page.setCurrent(currentPage);
         page.setSize(pageCount);
-        IPage<AutoDispatchUserVo> result1 = repairUserMapper.autoDispatchUser(page, schoolId, dateNow, articleId, buildId, keyWord);
+        //手动派单取消楼栋品类限制
+        IPage<AutoDispatchUserVo> result1 = repairUserMapper.autoDispatchUser(page, schoolId, dateNow, null, null, keyWord);
         Page<AutoDispatchUserVo> page1 = new Page<>();
         page.setCurrent(currentPage);
         page.setSize(pageCount);

src/main/resources/mapper/repair/RepairUserMapper.xml

@@ -184,11 +184,13 @@
         left join repair_work_type wt on wt.deleted = 0 and wt.id = ru.work_type
         where ru.school_id = #{schoolId} and ru.deleted = 0 and (ru.user_zzid = 1 or ru.user_zzid = 2) and ru.state = 1
 --         取消物品类别限制
+        <if test="articleId != null and articleId != '' and buildId != null and buildId != ''">
+            and ru.id in (select user_id from
+            (select user_id,(select GROUP_CONCAT(id) from repair_article_type where (id = repair_article_build.article_id or parent_id = repair_article_build.article_id) and deleted = 0) as article_id,build_id
+            from repair_article_build
+            where deleted = 0) d
+            where FIND_IN_SET(${articleId},d.article_id) and FIND_IN_SET(${buildId},d.build_id))
+        </if>
         <if test="keyWord != null and keyWord != ''">
             and (ru.user_name like '%' #{keyWord} '%' or ru.user_phone like '%' #{keyWord} '%')
         </if>