Merge remote-tracking branch 'origin/master'

sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/base/domain/RepairTaskDetails.java

@@ -16,6 +16,11 @@ public class RepairTaskDetails {
      */
     @ApiModelProperty(value = "id")
     private Long id;
+
+    /** 用户ID */
+    @ApiModelProperty(value = "userId")
+    private Long userId;
+
     /**
      * 任务ID
      */

sgzb-modules/sgzb-material/src/main/java/com/bonus/sgzb/base/service/impl/RepairServiceImpl.java

@@ -50,6 +50,7 @@ public class RepairServiceImpl implements RepairService {
     public List<RepairTaskDetails> getRepairMaTypeList(RepairTaskDetails bean) {
         Long companyId = SecurityUtils.getLoginUser().getSysUser().getCompanyId();
         bean.setCompanyId(companyId);
+        bean.setUserId(SecurityUtils.getLoginUser().getUserid());
         List<RepairTaskDetails> repairMaTypeList = mapper.getRepairMaTypeList(bean);
         return repairMaTypeList;
     }

sgzb-modules/sgzb-material/src/main/resources/mapper/base/RepairMapper.xml

@@ -207,7 +207,8 @@
                  left join ma_machine mm on mm.ma_id = rad.ma_id
                  left join sys_user su on rad.repairer = su.user_id
                  LEFT JOIN ma_type mt2 on mt.parent_id = mt2.type_id
-        where rad.task_id = #{taskId}
+                 LEFT JOIN ma_type_repair mtr on mtr.type_id = rad.type_id
+        where rad.task_id = #{taskId} and mtr.user_id = #{userId}
         <if test="companyId != null and companyId != ''">
             and rad.company_id = #{companyId}
         </if>