修改机构

src/main/java/cn/wisenergy/chnmuseum/party/web/controller/TBoxOperationController.java

@@ -134,9 +134,9 @@ public class TBoxOperationController extends BaseController {
     @RequiresPermissions("/boxOperation/delete")
     @ApiOperation(value = "根据ID删除机顶盒运维信息", notes = "根据ID删除机顶盒运维信息")
     @ApiImplicitParams(value = {
-            @ApiImplicitParam(name = "id", value = "标识ID", paramType = "path", dataType = "String")
+            @ApiImplicitParam(name = "id", value = "标识ID", paramType = "query", dataType = "String")
     })
-    public Map<String, Object> deleteTBoxOperation(@PathVariable("id") String id) {
+    public Map<String, Object> deleteTBoxOperation(String id) {
         boolean result = false;
         try {
             result = tBoxOperationService.removeById(id);

src/main/java/cn/wisenergy/chnmuseum/party/web/controller/TOrganController.java

@@ -123,9 +123,9 @@ public class TOrganController extends BaseController {
     @DeleteMapping("/delete")
     @RequiresPermissions("/organ/delete")
     @ApiOperation(value = "根据ID删除机构", notes = "根据ID删除机构")
-//    @ApiImplicitParams(value = {
-//            @ApiImplicitParam(name = "id", value = "标识ID", paramType = "path", dataType = "String")
-//    })
+    @ApiImplicitParams(value = {
+            @ApiImplicitParam(name = "id", value = "标识ID", paramType = "query", dataType = "String")
+    })
 //    @MethodLog(operModule = OperModule.ORG,operType = OperType.DELETE)
     public Map<String, Object> deleteTOrgan(String id) {
         boolean result = false;
@@ -193,6 +193,7 @@ public class TOrganController extends BaseController {
             }
             //设置用户数据权限
             queryWrapper.likeRight(TOrgan::getCode,user.getOrgCode());
+            queryWrapper.eq(TOrgan::getIsDeleted,false);
             // 设置排序规则
             queryWrapper.orderByDesc(TOrgan::getCreateTime);
             page = this.tOrganService.page(getPage(), queryWrapper);

src/main/resources/mapper/TOrganMapper.xml

@@ -46,6 +46,7 @@ where 1=1
         <if test=" org.code != null and org.code != '' ">
             and o.code LIKE concat(#{org.code},'%')
         </if>
+        and o.is_deleted = false
         order by o.create_time desc
     </select>