diff --git a/.idea/encodings.xml b/.idea/encodings.xml
index 03e76b2..f5b1b05 100644
--- a/.idea/encodings.xml
+++ b/.idea/encodings.xml
@@ -2,5 +2,25 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/.idea/modules.xml b/.idea/modules.xml
index 0a52fc0..8d41378 100644
--- a/.idea/modules.xml
+++ b/.idea/modules.xml
@@ -2,7 +2,17 @@
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/dm_service/src/main/java/com/ssm/manage/service/impl/SsmBaseStaffServiceImpl.java b/dm_service/src/main/java/com/ssm/manage/service/impl/SsmBaseStaffServiceImpl.java
index ca326d8..76f8c32 100644
--- a/dm_service/src/main/java/com/ssm/manage/service/impl/SsmBaseStaffServiceImpl.java
+++ b/dm_service/src/main/java/com/ssm/manage/service/impl/SsmBaseStaffServiceImpl.java
@@ -2900,9 +2900,9 @@ public class SsmBaseStaffServiceImpl extends BaseServiceImpl implemen
//TODO 取消校验限制
//从redis查询 if (redisClient.hasKey(codeKey)) if (passCode.equals(memberResponseRedisClient.get(codeKey).getPassCode()))
- if (true){
+ if (redisClient.hasKey(codeKey)){
//校验验证码
- if (true){
+ if (passCode.equals(memberResponseRedisClient.get(codeKey).getPassCode())){
staffTemporaryVo.setId(staffTemporary.getId());
staffTemporaryVo.setType(staffTemporary.getType());
staffTemporaryVo.setRegionId(staffTemporary.getRegionId());
diff --git a/dm_service/src/main/java/com/ssm/manage/service/impl/StaffTemporaryServiceImpl.java b/dm_service/src/main/java/com/ssm/manage/service/impl/StaffTemporaryServiceImpl.java
index 4f89434..369403f 100644
--- a/dm_service/src/main/java/com/ssm/manage/service/impl/StaffTemporaryServiceImpl.java
+++ b/dm_service/src/main/java/com/ssm/manage/service/impl/StaffTemporaryServiceImpl.java
@@ -116,6 +116,11 @@ public class StaffTemporaryServiceImpl extends BaseServiceImpl i
List blackLists = new ArrayList<>();
if (!CollectionUtils.isEmpty(identity)) {
Example blackExample = new Example(BlackList.class);
+ blackExample.selectProperties("urgentName","urgentPhone","urgentRelationship","id","beisenUserId",
+ "email","sex","staffNum","staffName","mobilePhone","identityCard","storeId","inputId",
+ "inputName","inputDate","type","job","regionId","endType","endId","endName","endTime",
+ "updateTime","employeeInformationId","employmentRecordId","isBeisen","isZhongkong",
+ "blacklistReasons");
blackExample.createCriteria().andIn(BlackListDto.Fields.identityCard, identity);
blackLists = blackListDao.selectByExample(blackExample);
}
diff --git a/dm_web/src/main/java/com/ssm/controller/ZhongkongTestController.java b/dm_web/src/main/java/com/ssm/controller/ZhongkongTestController.java
index b522c79..29113eb 100644
--- a/dm_web/src/main/java/com/ssm/controller/ZhongkongTestController.java
+++ b/dm_web/src/main/java/com/ssm/controller/ZhongkongTestController.java
@@ -4,6 +4,7 @@ import com.github.pagehelper.PageInfo;
import com.ssm.filter.LoginInterceptor;
import com.ssm.manage.dao.BlackListDao;
import com.ssm.manage.dao.StaffTemporaryDao;
+import com.ssm.manage.dto.BlackListDto;
import com.ssm.manage.entity.BlackList;
import com.ssm.manage.entity.StaffTemporary;
import com.ssm.manage.response.*;
@@ -13,6 +14,7 @@ import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.web.bind.annotation.*;
+import tk.mybatis.mapper.entity.Example;
import javax.servlet.http.HttpSession;
import java.io.IOException;
@@ -115,12 +117,21 @@ public class ZhongkongTestController {
temporary.setZhongkongDimission(0);
temporary.setZhongkongDimissionDate(null);
- staffTemporaryDao.updateByPrimaryKey(temporary);
+ staffTemporaryDao.updateByPrimaryKeySelective(temporary);
BlackList blackList = new BlackList();
- blackList.setIdentityCard(temporary.getIdentityCard());
- blackList = blackListDao.select(blackList).get(0);
+ Example blackExample = new Example(BlackList.class);
+ blackExample.selectProperties("urgentName","urgentPhone","urgentRelationship","id","beisenUserId",
+ "email","sex","staffNum","staffName","mobilePhone","identityCard","storeId","inputId",
+ "inputName","inputDate","type","job","regionId","endType","endId","endName","endTime",
+ "updateTime","employeeInformationId","employmentRecordId","isBeisen","isZhongkong",
+ "blacklistReasons");
+ blackExample.createCriteria().andEqualTo(BlackListDto.Fields.identityCard, temporary.getIdentityCard());
+ blackList = blackListDao.selectByExample(blackExample).get(0);
+// BlackList blackList = new BlackList();
+// blackList.setIdentityCard(temporary.getIdentityCard());
+// blackList = blackListDao.select(blackList).get(0);
blackList.setIsZhongkong(1);
- blackListDao.updateByPrimaryKey(blackList);
+ blackListDao.updateByPrimaryKeySelective(blackList);
// }
}
return pageResponse;