|
|
@@ -20,6 +20,7 @@ import cn.hnthyy.thmz.service.thmz.TsmzService;
|
|
|
import cn.hnthyy.thmz.service.thmz.UserService;
|
|
|
import cn.hnthyy.thmz.service.thmz.WindowsService;
|
|
|
import cn.hutool.core.codec.Base64;
|
|
|
+import cn.hutool.core.convert.Convert;
|
|
|
import cn.hutool.core.date.DateUnit;
|
|
|
import cn.hutool.core.map.MapUtil;
|
|
|
import lombok.extern.slf4j.Slf4j;
|
|
|
@@ -95,6 +96,12 @@ public class LoginController {
|
|
|
}
|
|
|
user = new User(employee.getEmployeeCode(),userParam.getUserCode(), employee.getEmployeeName(),workStatus);
|
|
|
userService.saveUser(user,employee.getDeptCode());
|
|
|
+ }else {
|
|
|
+ Integer delFlag = Convert.toInt(employee.getDelFlag(), 0);
|
|
|
+ if(delFlag == 0 && !WorkingStatusEnum.WORKING.code.equals(user.getStatus())){
|
|
|
+ user.setStatus(WorkingStatusEnum.WORKING.code);
|
|
|
+ userService.updateUser(user);
|
|
|
+ }
|
|
|
}
|
|
|
//在职和编外
|
|
|
if (!(WorkingStatusEnum.WORKING.code.equals(user.getStatus()) || WorkingStatusEnum.RETIRE.code.equals(user.getStatus()))) {
|
lihong