修改bug

soc-api/soc-api-system/src/main/java/com/xunmei/system/api/domain/SysUserInformation.java

@@ -41,7 +41,7 @@ private static final long serialVersionUID=1L;
 
     /** 所属部门ID */
             @ApiModelProperty(value = "所属部门ID")
-    private Long deptId;
+    private String deptId;
 
     /** 职务ID */
             @ApiModelProperty(value = "职务")

soc-common/soc-common-security/src/main/java/com/xunmei/common/security/service/TokenService.java

@@ -2,6 +2,7 @@ package com.xunmei.common.security.service;
 
 import com.xunmei.common.core.constant.CacheConstants;
 import com.xunmei.common.core.constant.SecurityConstants;
+import com.xunmei.common.core.utils.DateUtils;
 import com.xunmei.common.core.utils.JwtUtils;
 import com.xunmei.common.core.utils.ServletUtils;
 import com.xunmei.common.core.utils.StringUtils;
@@ -152,7 +153,7 @@ public class TokenService {
         loginUser.setExpireTime(loginUser.getLoginTime() + expireTime * MILLIS_MINUTE);
         // 根据uuid将loginUser缓存
         String userKey = getTokenKey(loginUser.getToken());
-        remoteUserService.userLoginInfo(loginUser.getUserid(), new Date(), loginUser.getIpaddr(), SecurityConstants.INNER);
+        remoteUserService.userLoginInfo(loginUser.getUserid(), DateUtils.getNowDate(), loginUser.getIpaddr(), SecurityConstants.INNER);
         //登陆后删除之前的token
         RedisUtils.deleteByPrefix(userKey);
         RedisUtils.setCacheObject(userKey, loginUser, Duration.ofMinutes(expireTime));

soc-modules/soc-modules-core/src/main/java/com/xunmei/core/access/service/impl/TMonitoringRetrievalPlanServiceImpl.java

@@ -6,7 +6,6 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.xunmei.common.core.constant.SecurityConstants;
-import com.xunmei.common.core.domain.R;
 import com.xunmei.common.core.utils.DateUtils;
 import com.xunmei.common.core.utils.StringUtils;
 import com.xunmei.common.core.web.page.TableDataInfo;
@@ -21,12 +20,8 @@ import com.xunmei.system.api.RemoteUserService;
 import com.xunmei.system.api.domain.SysOrg;
 import com.xunmei.system.api.domain.SysRole;
 import com.xunmei.system.api.domain.SysUser;
-import com.xunmei.system.api.function.RemoteCallHandlerExecutor;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.beans.factory.config.ConfigurableBeanFactory;
-import org.springframework.context.annotation.DependsOn;
 import org.springframework.context.annotation.Lazy;
-import org.springframework.context.annotation.Scope;
 import org.springframework.stereotype.Service;
 
 import javax.annotation.Resource;
@@ -81,7 +76,8 @@ public class TMonitoringRetrievalPlanServiceImpl extends ServiceImpl<TMonitoring
         if (null == tMonitoringRetrievalPlan.getOrgId()) {
             tMonitoringRetrievalPlan.setOrgId(data.get(0).getId());
         }
-        if (tMonitoringRetrievalPlan.getCheckSub()) {
+        Boolean checkSub = tMonitoringRetrievalPlan.getCheckSub();
+        if (Boolean.TRUE.equals(checkSub)) {
             List<Long> ids = remoteOrgService.selectCheckSubOrgIdList(tMonitoringRetrievalPlan.getOrgId(), SecurityConstants.INNER);
             //清空前端传递的org_id
             tMonitoringRetrievalPlan.setOrgId(null);
@@ -246,38 +242,4 @@ public class TMonitoringRetrievalPlanServiceImpl extends ServiceImpl<TMonitoring
         return tMonitoringRetrievalPlanMapper.deleteById(id);
     }
 
-    @Override
-    public boolean saveBatch(Collection<TMonitoringRetrievalPlan> entityList, int batchSize) {
-        return false;
-    }
-
-    @Override
-    public boolean saveOrUpdateBatch(Collection<TMonitoringRetrievalPlan> entityList, int batchSize) {
-        return false;
-    }
-
-    @Override
-    public boolean updateBatchById(Collection<TMonitoringRetrievalPlan> entityList, int batchSize) {
-        return false;
-    }
-
-    @Override
-    public boolean saveOrUpdate(TMonitoringRetrievalPlan entity) {
-        return false;
-    }
-
-    @Override
-    public TMonitoringRetrievalPlan getOne(Wrapper<TMonitoringRetrievalPlan> queryWrapper, boolean throwEx) {
-        return null;
-    }
-
-    @Override
-    public Map<String, Object> getMap(Wrapper<TMonitoringRetrievalPlan> queryWrapper) {
-        return null;
-    }
-
-    @Override
-    public <V> V getObj(Wrapper<TMonitoringRetrievalPlan> queryWrapper, Function<? super Object, V> mapper) {
-        return null;
-    }
 }

soc-modules/soc-modules-system/src/main/java/com/xunmei/system/controller/SysUserController.java

@@ -2,6 +2,7 @@ package com.xunmei.system.controller;
 
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.xunmei.common.core.domain.R;
+import com.xunmei.common.core.utils.DateUtils;
 import com.xunmei.common.core.utils.StringUtils;
 import com.xunmei.common.core.web.controller.BaseController;
 import com.xunmei.common.core.web.domain.AjaxResult;
@@ -187,10 +188,6 @@ public class SysUserController extends BaseController {
         } else if (StringUtils.isNotEmpty(user.getPhone()) && !userService.checkPhoneUnique(user)) {
             return error("新增用户'" + user.getUsername() + "'失败，手机号码已存在");
         }
-//        else if (StringUtils.isNotEmpty(user.get()) && !userService.checkEmailUnique(user))
-//        {
-//            return error("新增用户'" + user.getUserName() + "'失败，邮箱账号已存在");
-//        }
         user.setCreateBy(SecurityUtils.getUsername());
         user.setCreateTime(new Date());
         //isp的加密方式
@@ -356,6 +353,9 @@ public class SysUserController extends BaseController {
     public R<Boolean> userLoginInfo(Long id,Date loginTime, String loginIp) {
         SysUser sysUser = userService.selectUserById(id);
         sysUser.setLastIp(loginIp);
+        if (null==loginTime){
+            loginTime= DateUtils.getNowDate();
+        }
         sysUser.setLastTime(loginTime);
         userService.saveOrUpdate(sysUser);
         return R.ok(true);

soc-modules/soc-modules-system/src/main/java/com/xunmei/system/service/impl/SysUserServiceImpl.java

@@ -10,6 +10,7 @@ import com.xunmei.common.core.utils.bean.BeanValidators;
 import com.xunmei.common.core.web.page.TableDataInfo;
 import com.xunmei.common.datascope.annotation.DataScope;
 import com.xunmei.common.security.utils.SecurityUtils;
+import com.xunmei.system.api.domain.SysOrg;
 import com.xunmei.system.api.domain.SysRole;
 import com.xunmei.system.api.domain.SysUser;
 import com.xunmei.system.domain.SysPost;
@@ -311,6 +312,8 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> impl
     public int insertUser(SysUser user) {
         user.setCreateTime(new Date());
         // 新增用户信息
+        SysOrg sysOrg = orgService.selectSysOrgById(user.getOrgId());user.setOrgName(sysOrg.getName());
+
         int rows = userMapper.insert(user);
         // 新增用户岗位关联
 //        insertUserPost(user);
@@ -350,6 +353,7 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> impl
         insertUserPost(user);
         user.setPassword(null);
         user.setSalt(null);
+        SysOrg sysOrg = orgService.selectSysOrgById(user.getOrgId());user.setOrgName(sysOrg.getName());
         return userMapper.updateById(user);
     }