From 19321e1348baefa2a9f5211c42f8b797c0fcccd1 Mon Sep 17 00:00:00 2001
From: rk <94314517@qq.com>
Date: 星期一, 27 十月 2025 18:11:56 +0800
Subject: [PATCH] 登录验证

---
 server/system_service/src/main/java/com/doumee/service/system/impl/SystemUserServiceImpl.java |   32 +++++++++++++++++++++++++++-----
 1 files changed, 27 insertions(+), 5 deletions(-)

diff --git a/server/system_service/src/main/java/com/doumee/service/system/impl/SystemUserServiceImpl.java b/server/system_service/src/main/java/com/doumee/service/system/impl/SystemUserServiceImpl.java
index 0d52a93..9cbb5f6 100644
--- a/server/system_service/src/main/java/com/doumee/service/system/impl/SystemUserServiceImpl.java
+++ b/server/system_service/src/main/java/com/doumee/service/system/impl/SystemUserServiceImpl.java
@@ -2,9 +2,11 @@
 
 import com.baomidou.mybatisplus.core.conditions.Wrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.doumee.biz.system.SystemDictDataBiz;
+import com.doumee.core.utils.DateUtil;
 import com.doumee.dao.business.model.Member;
 import com.doumee.service.business.third.model.PageData;
 import com.doumee.service.business.third.model.PageWrap;
@@ -93,6 +95,8 @@
     public void updateById(SystemUser systemUser) {
         systemUserMapper.updateById(systemUser);
     }
+
+
 
     @Override
     @Transactional
@@ -260,6 +264,7 @@
                 .eq(SystemUser::getDeleted,Constants.ZERO)
                 .leftJoin(Company.class,Company::getId,SystemUser::getCompanyId)
                 .leftJoin(Member.class,Member::getId,SystemUser::getMemberId)
+                .leftJoin(" position p on p.id = t2.POSITION_ID ")
                 .and(StringUtils.isNotBlank(systemUser.getUsername()),ms->ms.like(SystemUser::getUsername,systemUser.getUsername())
                         .or().like(SystemUser::getMobile,systemUser.getUsername())
                         .or().like(SystemUser::getRealname,systemUser.getUsername()))
@@ -275,7 +280,8 @@
                 .like(StringUtils.isNotBlank(systemUser.getUsername()),SystemUser::getUsername,systemUser.getUsername())
                 .like(StringUtils.isNotBlank(systemUser.getCompanyName()),Company::getName,systemUser.getCompanyName())
                 .apply(StringUtils.isNotBlank(systemUser.getCompanySpecialId())," find_in_set('"+systemUser.getCompanySpecialId()+"',REPLACE(t1.company_path,'/',','))")
-                .orderByAsc( Company::getPinyin )
+                .orderByAsc( Company::getSortnum )
+                .orderByAsc( " p.SORTNUM " )
                 .orderByAsc(SystemUser::getPinyin)
          ;
         List<SystemUser> result = systemUserJoinMapper.selectJoinList( SystemUser.class, wrapper);
@@ -289,7 +295,6 @@
                 }
             }
         }
-
         return result;
     }
 
@@ -302,12 +307,29 @@
         MPJLambdaWrapper<SystemUser> queryWrapper = new MPJLambdaWrapper<>();
         queryWrapper.selectAll(SystemUser.class);
         queryWrapper.eq(SystemUser::getDeleted, Constants.ZERO);
-        queryWrapper.leftJoin(Company.class,Company::getId,SystemUser::getCompanyId);
-        queryWrapper.eq(Company::getType,Constants.ONE);
-        queryWrapper.orderByAsc(SystemUser::getPinyin);
+        queryWrapper.leftJoin(Company.class,Company::getId,SystemUser::getCompanyId)
+                .leftJoin(" position p on p.id = t2.POSITION_ID ");
+        queryWrapper.eq(Company::getType,Constants.ONE)
+        .orderByAsc( Company::getSortnum )
+        .orderByAsc( " p.SORTNUM " )
+        .orderByAsc(SystemUser::getPinyin);
         List<SystemUser> result = systemUserJoinMapper.selectJoinList( SystemUser.class, queryWrapper);
         return result;
     }
 
 
+
+    @Override
+    public void jobForOpenProhibitStatus() {
+        systemUserMapper.update(null,new UpdateWrapper<SystemUser>().lambda()
+                .set(SystemUser::getProhibitStatus,Constants.ZERO)
+                .set(SystemUser::getErrTimes,Constants.ZERO)
+                .setSql(" PROHIBIT_REMARK = '浜�"+ DateUtil.getCurrDateTime()+"鑷姩瑙i櫎绂佹鐧诲綍锛�' ")
+                .eq(SystemUser::getProhibitStatus,Constants.ONE)
+                .apply("  now() > PROHIBIT_TIME " )
+        );
+    }
+
+
+
 }

--
Gitblit v1.9.3