添加工作人员逻辑删除字段

base-manager/src/main/java/com/mortals/xhx/module/workman/web/WorkmanController.java

@@ -16,6 +16,7 @@ import com.mortals.framework.web.BaseCRUDJsonBodyMappingController;
 import com.mortals.xhx.base.system.param.service.ParamService;
 import com.mortals.xhx.base.system.upload.service.UploadService;
 import com.mortals.xhx.common.code.OnlineEnum;
+import com.mortals.xhx.common.code.YesNoEnum;
 import com.mortals.xhx.module.dept.model.DeptEntity;
 import com.mortals.xhx.module.dept.service.DeptService;
 import com.mortals.xhx.module.site.model.SiteEntity;
@@ -61,6 +62,7 @@ public class WorkmanController extends BaseCRUDJsonBodyMappingController<Workman
         super.setModuleDesc("工作人员");
     }
 
+
     @Override
     protected void init(Map<String, Object> model, Context context) {
         this.addDict(model, "politicalstatus", paramService.getParamBySecondOrganize("Workman", "politicalstatus"));
@@ -72,6 +74,20 @@ public class WorkmanController extends BaseCRUDJsonBodyMappingController<Workman
     }
 
 
+    /**
+     * @param query
+     * @param model
+     * @param context
+     * @throws AppException
+     */
+    @Override
+    protected void doListBefore(WorkmanEntity query, Map<String, Object> model, Context context) throws AppException {
+        if (!ObjectUtils.isEmpty(query)) {
+            query.setDeleted(YesNoEnum.NO.getValue());
+        }
+        super.doListBefore(query, model, context);
+    }
+
     /**
      *
      */

base-manager/src/test/java/com/mortals/httpclient/system/system.http

@@ -9,7 +9,7 @@ Content-Type: application/json
 
 {
   "loginName":"admin",
-  "password":"xhxADMIN8@a",
+  "password":"admin",
   "securityCode":"admin"
 }
 

base-manager/src/test/java/com/mortals/httpclient/workman/WorkmanController.http

@@ -40,7 +40,14 @@ Accept: application/json
 
 
 ###工作人员删除
-GET {{baseUrl}}/workman/delete?id={{Workman_id}}
+GET {{baseUrl}}/workman/delete?id=35
+Authorization: {{authToken}}
+Accept: application/json
+
+
+###工作人员逻辑删除
+GET {{baseUrl}}/workman/logicDelete?ids=35
+Authorization: {{authToken}}
 Accept: application/json