非现场执法执法人员优化

zdxt-modules/zdxt-enforcement-code/src/main/java/com/zdxt/enforcementcode/controller/app/enforcement/AppEnfLoginController.java

@@ -1,6 +1,7 @@
 package com.zdxt.enforcementcode.controller.app.enforcement;
 
 import cn.dev33.satoken.annotation.SaIgnore;
+import com.zdxt.enforcementcode.common.commonenum.PlatformTypeEnums;
 import com.zdxt.enforcementcode.common.util.CommonUtil;
 import com.zdxt.enforcementcode.service.enforcement.IAppEnfLoginService;
 import com.zdxt.enforcementcode.controller.app.LoginController;
@@ -123,7 +124,8 @@ public class AppEnfLoginController extends LoginController {
 
         data.put("bureauUnitId", bureauDept.getDeptId());
         data.put("bureauUnitName", bureauDept.getDeptName());
-
+        data.put("lawOfficer", true);
+        data.put("platformType", PlatformTypeEnums.ENFORCEMENT.getKey());
         return R.ok(data);
     }
 

zdxt-modules/zdxt-enforcement-nos/src/main/java/com/zdxt/enforcementnos/service/impl/NosLawEnforcementTaskServiceImpl.java

@@ -5,6 +5,7 @@ import cn.hutool.core.date.DateTime;
 import cn.hutool.core.date.DateUtil;
 import cn.hutool.core.util.IdUtil;
 import cn.hutool.core.util.StrUtil;
+import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
@@ -18,6 +19,7 @@ import com.zdxt.enforcementnos.domain.vo.*;
 import com.zdxt.enforcementnos.mapper.NosLawEnforcementTaskMapper;
 import com.zdxt.enforcementnos.service.*;
 import jakarta.annotation.Resource;
+import lombok.extern.slf4j.Slf4j;
 import org.dromara.common.core.exception.ServiceException;
 import org.dromara.common.mybatis.core.page.TableDataInfo;
 import org.dromara.common.satoken.utils.LoginHelper;
@@ -34,6 +36,7 @@ import java.util.stream.Collectors;
 * @author msy
 */
 @Service
+@Slf4j
 public class NosLawEnforcementTaskServiceImpl extends ServiceImpl<NosLawEnforcementTaskMapper, NosLawEnforcementTask>
     implements NosLawEnforcementTaskService {
 
@@ -130,8 +133,9 @@ public class NosLawEnforcementTaskServiceImpl extends ServiceImpl<NosLawEnforcem
         Integer platformType = LoginHelper.getPlatformType();
         // 当前执法人员所在的执法单位
         SysDeptVo userBureauDept = DataFilterUtil.getUserBureauDept(LoginHelper.getUserId());
-
-        if(!PlatformTypeEnums.ENFORCEMENT.getKey().equals(platformType) || userBureauDept == null) {
+        log.info("非现场执法：当前用户所在执法单位：{}", platformType);
+        log.info("非现场执法：当前用户所在执法单位：{}", JSONObject.toJSONString(userBureauDept));
+        if(!PlatformTypeEnums.ENFORCEMENT.getKey().equals(platformType) &&  userBureauDept == null) {
             throw new ServiceException("当前用户不属于执法端用户，无法创建任务");
         }