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

base-manager/src/main/java/com/mortals/xhx/module/workman/service/impl/WorkmanServiceImpl.java

@@ -10,6 +10,7 @@ import com.mortals.framework.util.SecurityUtil;
 import com.mortals.framework.util.StringUtils;
 import com.mortals.xhx.base.system.upload.service.UploadService;
 import com.mortals.xhx.base.system.user.service.UserService;
+import com.mortals.xhx.common.code.YesNoEnum;
 import com.mortals.xhx.common.utils.ZipUtils;
 import com.mortals.xhx.module.area.model.AreaEntity;
 import com.mortals.xhx.module.workman.dao.WorkmanDao;
@@ -103,11 +104,8 @@ public class WorkmanServiceImpl extends AbstractCRUDCacheServiceImpl<WorkmanDao,
 
     @Override
     public WorkmanEntity doLogin(String loginName, String password, String loginIp) throws AppException {
-        WorkmanEntity workmanEntity = this.getExtCache(loginName);
-        if (ObjectUtils.isEmpty(workmanEntity)) {
-            workmanEntity = this.selectOne(new WorkmanQuery().loginName(loginName));
-        }
-        if (workmanEntity == null || !workmanEntity.getLoginName().equals(loginName)) {
+        WorkmanEntity workmanEntity = this.selectOne(new WorkmanQuery().loginName(loginName).deleted(YesNoEnum.NO.getValue()));
+        if (ObjectUtils.isEmpty(workmanEntity) ) {
             throw new AppException("用户名不存在！");
         }
         try {