bug

src/main/java/com/huiju/estateagents/controller/TaRoleController.java

@@ -5,6 +5,7 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.huiju.estateagents.base.BaseController;
 import com.huiju.estateagents.base.ResponseBean;
+import com.huiju.estateagents.common.CommConstant;
 import com.huiju.estateagents.entity.TaRole;
 import com.huiju.estateagents.service.ITaRoleService;
 import org.slf4j.Logger;
@@ -49,6 +50,7 @@ public class TaRoleController extends BaseController {
 		    IPage<TaRole> pg = new Page<>(pageNum, pageSize);
             QueryWrapper<TaRole> queryWrapper = new QueryWrapper<>();
             queryWrapper.eq("org_id",orgId);
+            queryWrapper.eq("status", CommConstant.STATUS_NORMAL);
             queryWrapper.orderByDesc("create_date");
 
             IPage<TaRole> result = iTaRoleService.page(pg, queryWrapper);
@@ -141,7 +143,7 @@ public class TaRoleController extends BaseController {
     }
 
     /**
-     * 修改角色状态--停用
+     * 修改角色状态--删除
      * @param id
      * @return
      */
@@ -150,8 +152,9 @@ public class TaRoleController extends BaseController {
         ResponseBean responseBean = new ResponseBean();
         TaRole taRole = new TaRole();
         taRole = iTaRoleService.getById(id);
-        taRole.setStatus(taRole.getStatus().equals(0)?1:0);
-        iTaRoleService.updateById(taRole);
+        if (null != taRole){
+            iTaRoleService.removeById(id);
+        }
         return responseBean;
     }