Merge branch 'fu-dev' of uskycloud/usky-modules into server-165

service-fire/service-fire-biz/src/main/java/com/usky/fire/mapper/PatrolInspectionPersonnelMapper.java

@@ -2,6 +2,7 @@ package com.usky.fire.mapper;
 
 import com.usky.fire.domain.PatrolInspectionPersonnel;
 import com.usky.common.mybatis.core.CrudMapper;
+import org.springframework.stereotype.Repository;
 
 /**
  * <p>
@@ -11,6 +12,7 @@ import com.usky.common.mybatis.core.CrudMapper;
  * @author JCB
  * @since 2022-07-26
  */
+@Repository
 public interface PatrolInspectionPersonnelMapper extends CrudMapper<PatrolInspectionPersonnel> {
 
 }

service-fire/service-fire-biz/src/main/java/com/usky/fire/service/impl/PatrolInspectionAttendanceServiceImpl.java

@@ -6,10 +6,13 @@ import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 
 
+import com.usky.common.core.exception.BusinessException;
 import com.usky.common.core.util.StringUtils;
 import com.usky.common.security.utils.SecurityUtils;
 import com.usky.fire.domain.PatrolInspectionAttendance;
+import com.usky.fire.domain.PatrolInspectionPersonnel;
 import com.usky.fire.mapper.PatrolInspectionAttendanceMapper;
+import com.usky.fire.mapper.PatrolInspectionPersonnelMapper;
 import com.usky.fire.service.PatrolInspectionAttendanceService;
 import com.usky.common.mybatis.core.AbstractCrudService;
 import com.usky.fire.service.PatrolInspectionPersonnelService;
@@ -44,6 +47,9 @@ public class PatrolInspectionAttendanceServiceImpl extends AbstractCrudService<P
 
     @Autowired
     private PatrolInspectionPersonnelService patrolInspectionPersonnelService;
+
+    @Autowired
+    private PatrolInspectionPersonnelMapper patrolInspectionPersonnelMapper;
     @Override
     public IPage<Map<String, Object>> pageList(Integer pageNum, Integer pageSize, String operateCode, String operator, LocalDateTime startTime, LocalDateTime endTime) {
         IPage<PatrolInspectionAttendance> page = new Page<>(pageNum, pageSize);
@@ -100,6 +106,12 @@ public class PatrolInspectionAttendanceServiceImpl extends AbstractCrudService<P
 
     @Override
     public void add(PatrolInspectionAttendance patrolInspectionAttendance) {
+        LambdaQueryWrapper<PatrolInspectionPersonnel> wrapper = Wrappers.lambdaQuery();
+        wrapper.eq(PatrolInspectionPersonnel::getUserId,SecurityUtils.getUserId());
+        List<PatrolInspectionPersonnel> personnelList = patrolInspectionPersonnelMapper.selectList(wrapper);
+        if (personnelList.isEmpty()) {
+            throw new BusinessException("您不是巡检人员，不可进行此操作");
+        }
         patrolInspectionAttendance.setTenantId(SecurityUtils.getTenantId());
         patrolInspectionAttendance.setOperator(SecurityUtils.getUsername());
         patrolInspectionAttendance.setOperatorId(SecurityUtils.getUserId());

service-fire/service-fire-biz/src/main/java/com/usky/fire/service/impl/PatrolInspectionPersonnelServiceImpl.java

@@ -232,13 +232,9 @@ public class PatrolInspectionPersonnelServiceImpl extends AbstractCrudService<Pa
      */
     public PatrolInspectionPersonnel getStatus(){
         LambdaQueryWrapper<PatrolInspectionPersonnel> wrapper = Wrappers.lambdaQuery();
-        wrapper.eq(PatrolInspectionPersonnel::getUserId,SecurityUtils.getUserId());
-        if (baseMapper.selectOne(wrapper)==null) {
-            throw new BusinessException("您不是巡检人员，无法进行此操作！");
-        }else {
-            wrapper.last("LIMIT 1");
+        wrapper.eq(PatrolInspectionPersonnel::getUserId,SecurityUtils.getUserId())
+                .last("LIMIT 1");
         return baseMapper.selectOne(wrapper);
-        }
     }