BJ_FS / urbanops

Commit d008c00ded4ca6cf10f7a8ac23c841ece0900595

Authored by wangqian
2 parents 611bbe05 a3d0e799

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

Inline Side-by-side
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
  View file @d008c00
1 1 package com.zteits.urbanops.module.garden.controller.admin.emergencytask;
2 2  
3   -import com.alibaba.fastjson.JSONObject;
4 3 import com.zteits.urbanops.framework.common.biz.system.dict.dto.DictDataRespDTO;
5   -import jodd.util.StringUtil;
6 4 import org.springframework.util.CollectionUtils;
7 5 import org.springframework.web.bind.annotation.*;
8 6 import jakarta.annotation.Resource;
... ...
urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/controller/admin/emergencytask/vo/EmergencyTaskApprovalReqVO.java
  View file @d008c00
... ... @@ -20,7 +20,6 @@ public class EmergencyTaskApprovalReqVO {
20 20 private Integer busiStatus;
21 21  
22 22 @Schema(description = "审批备注", requiredMode = Schema.RequiredMode.REQUIRED, example = "审批备注")
23   - @Max(value = 64, message = "审批备注长度不能超过64")
24 23 private String approvalRemarks;
25 24  
26 25 }
27 26 \ No newline at end of file
... ...
urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/service/emergencytask/EmergencyTaskServiceImpl.java
  View file @d008c00
... ... @@ -3,19 +3,15 @@ package com.zteits.urbanops.module.garden.service.emergencytask;
3 3 import cn.hutool.core.collection.CollUtil;
4 4 import cn.hutool.core.collection.CollectionUtil;
5 5 import cn.hutool.core.util.RandomUtil;
6   -import com.alibaba.fastjson.JSON;
7   -import com.alibaba.fastjson.JSONObject;
8   -import com.baomidou.mybatisplus.core.conditions.Wrapper;
9 6 import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
10 7 import com.zteits.urbanops.framework.common.biz.system.dict.dto.DictDataRespDTO;
  8 +import com.zteits.urbanops.framework.datapermission.core.annotation.DataPermission;
11 9 import com.zteits.urbanops.framework.security.core.util.SecurityFrameworkUtils;
12   -import com.zteits.urbanops.module.garden.controller.admin.road.vo.RoadRespVO;
13 10 import com.zteits.urbanops.module.garden.dal.dataobject.emergencytask.EmergencyMachineryDO;
14 11 import com.zteits.urbanops.module.garden.dal.mysql.emergencytask.EmergencyMachineryMapper;
15 12 import com.zteits.urbanops.module.system.api.dept.DeptApi;
16 13 import com.zteits.urbanops.module.system.api.dept.dto.DeptRespDTO;
17 14 import com.zteits.urbanops.module.system.api.dict.DictDataApi;
18   -import jodd.util.StringUtil;
19 15 import org.apache.commons.lang3.StringUtils;
20 16 import org.springframework.stereotype.Service;
21 17 import jakarta.annotation.Resource;
... ... @@ -194,6 +190,7 @@ public class EmergencyTaskServiceImpl implements EmergencyTaskService {
194 190 return emergencyTaskRespVO;
195 191 }
196 192  
  193 + @DataPermission(enable = true)
197 194 @Override
198 195 public PageResult<EmergencyTaskRespVO> getEmergencyTaskPage(EmergencyTaskPageReqVO pageReqVO) {
199 196 Long companyId = SecurityFrameworkUtils.getCompanyId();
... ...