Merge remote-tracking branch 'origin/dev' into dev

wangqian
2 parents 611bbe05 a3d0e799
Showing 3 changed files with 2 additions and 8 deletions
urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/controller/admin/emergencytask/EmergencyTaskController.java
urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/controller/admin/emergencytask/vo/EmergencyTaskApprovalReqVO.java
urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/service/emergencytask/EmergencyTaskServiceImpl.java
 package com.zteits.urbanops.module.garden.controller.admin.emergencytask;
-import com.alibaba.fastjson.JSONObject;
 import com.zteits.urbanops.framework.common.biz.system.dict.dto.DictDataRespDTO;
-import jodd.util.StringUtil;
 import org.springframework.util.CollectionUtils;
 import org.springframework.web.bind.annotation.*;
 import jakarta.annotation.Resource;
@@ -20,7 +20,6 @@ public class EmergencyTaskApprovalReqVO {
     private Integer busiStatus;
     @Schema(description = "审批备注", requiredMode = Schema.RequiredMode.REQUIRED, example = "审批备注")
-    @Max(value = 64, message = "审批备注长度不能超过64")
     private String approvalRemarks;
 }
 \ No newline at end of file
@@ -3,19 +3,15 @@ package com.zteits.urbanops.module.garden.service.emergencytask;
 import cn.hutool.core.collection.CollUtil;
 import cn.hutool.core.collection.CollectionUtil;
 import cn.hutool.core.util.RandomUtil;
-import com.alibaba.fastjson.JSON;
-import com.alibaba.fastjson.JSONObject;
-import com.baomidou.mybatisplus.core.conditions.Wrapper;
 import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
 import com.zteits.urbanops.framework.common.biz.system.dict.dto.DictDataRespDTO;
+import com.zteits.urbanops.framework.datapermission.core.annotation.DataPermission;
 import com.zteits.urbanops.framework.security.core.util.SecurityFrameworkUtils;
-import com.zteits.urbanops.module.garden.controller.admin.road.vo.RoadRespVO;
 import com.zteits.urbanops.module.garden.dal.dataobject.emergencytask.EmergencyMachineryDO;
 import com.zteits.urbanops.module.garden.dal.mysql.emergencytask.EmergencyMachineryMapper;
 import com.zteits.urbanops.module.system.api.dept.DeptApi;
 import com.zteits.urbanops.module.system.api.dept.dto.DeptRespDTO;
 import com.zteits.urbanops.module.system.api.dict.DictDataApi;
-import jodd.util.StringUtil;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.stereotype.Service;
 import jakarta.annotation.Resource;
@@ -194,6 +190,7 @@ public class EmergencyTaskServiceImpl implements EmergencyTaskService {
         return emergencyTaskRespVO;
     }
+    @DataPermission(enable = true)
     @Override
     public PageResult<EmergencyTaskRespVO> getEmergencyTaskPage(EmergencyTaskPageReqVO pageReqVO) {
         Long companyId = SecurityFrameworkUtils.getCompanyId();