diff --git a/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/controller/admin/emergencytask/EmergencyTaskController.java b/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/controller/admin/emergencytask/EmergencyTaskController.java index b10a3dd..a4c2908 100644 --- a/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/controller/admin/emergencytask/EmergencyTaskController.java +++ b/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/controller/admin/emergencytask/EmergencyTaskController.java @@ -1,8 +1,6 @@ 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; diff --git a/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/controller/admin/emergencytask/vo/EmergencyTaskApprovalReqVO.java b/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/controller/admin/emergencytask/vo/EmergencyTaskApprovalReqVO.java index e1955c6..94be619 100644 --- a/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/controller/admin/emergencytask/vo/EmergencyTaskApprovalReqVO.java +++ b/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/controller/admin/emergencytask/vo/EmergencyTaskApprovalReqVO.java @@ -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 diff --git a/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/service/emergencytask/EmergencyTaskServiceImpl.java b/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/service/emergencytask/EmergencyTaskServiceImpl.java index 0350e49..7672b04 100644 --- a/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/service/emergencytask/EmergencyTaskServiceImpl.java +++ b/urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/service/emergencytask/EmergencyTaskServiceImpl.java @@ -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,13 +190,14 @@ public class EmergencyTaskServiceImpl implements EmergencyTaskService { return emergencyTaskRespVO; } + @DataPermission(enable = true) @Override public PageResult getEmergencyTaskPage(EmergencyTaskPageReqVO pageReqVO) { Long companyId = SecurityFrameworkUtils.getCompanyId(); //超级管理员全返回 - if(companyId != null && !companyId.equals(100L)){ - pageReqVO.setCompanyId(companyId); - } +// if(companyId != null && !companyId.equals(100L)){ +// pageReqVO.setCompanyId(companyId); +// } PageResult page = emergencyTaskMapper.selectPage(pageReqVO); List list = page.getList();