Commit 9622e363 authored by tianyiming's avatar tianyiming

获取当前登录人人员类型 接口优化

parent 432c65c6
......@@ -111,7 +111,7 @@ public class ControllerAop {
urls.add("/tcm/base-institution/register");
urls.add("/tcm/base-individuality/person/register");
urls.add("/tcm/userInfo/arrangement-statistic");
urls.add("/tcm/userInfo/arrangement-statistic");
urls.add("/tcm/userInfo/getPersonType");
// 获取请求路径
for (String uri : urls) {
Pattern p = Pattern.compile(uri);
......
......@@ -30,4 +30,6 @@ public interface TzsUserInfoMapper extends BaseMapper<TzsUserInfo> {
List<String> selectUserIds();
List<GroupAndPersonInfoDto> getUnitInfoByUserId(Long groupId);
String selectPostNameByUserId(String userId);
}
......@@ -204,4 +204,8 @@
AND tzei.unit_type <![CDATA[<>]]> '检验检测机构'
AND tui.amos_user_id IN (SELECT USER_ID FROM privilege_group_user WHERE GROUP_SEQ = #{groupId})
</select>
<select id="selectPostNameByUserId" resultType="java.lang.String">
SELECT post_name FROM "tzs_user_info" WHERE amos_user_id = #{userId}
</select>
</mapper>
\ No newline at end of file
......@@ -29,6 +29,7 @@ import com.yeejoin.amos.feign.privilege.model.AgencyUserModel;
import com.yeejoin.amos.feign.privilege.model.CompanyModel;
import com.yeejoin.amos.feign.privilege.model.GroupModel;
import com.yeejoin.amos.feign.privilege.model.RoleModel;
import lombok.extern.slf4j.Slf4j;
import org.apache.commons.lang3.StringUtils;
import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired;
......@@ -44,6 +45,7 @@ import java.util.*;
import java.util.stream.Collectors;
@Service
@Slf4j
public class TzsUserInfoServiceImpl extends BaseService<TzsUserInfoDto, TzsUserInfo, TzsUserInfoMapper> implements ITzsUserInfoService {
@Autowired
......@@ -443,14 +445,13 @@ public class TzsUserInfoServiceImpl extends BaseService<TzsUserInfoDto, TzsUserI
@Override
public Map<String, Object> getPersonType() {
ReginParams reginParams = JSON.parseObject(redisUtils.get(RedisKey.buildReginKey(RequestContext.getExeUserId(), RequestContext.getToken())).toString(), ReginParams.class);
if (ObjectUtils.isEmpty(reginParams)) {
String userId = RequestContext.getExeUserId();
if (ObjectUtils.isEmpty(userId)) {
return null;
}
String userId = reginParams.getUserModel().getUserId();
TzsUserInfo tzsUserInfo = tzsUserInfoMapper.selectOne(new QueryWrapper<TzsUserInfo>().eq("amos_user_id", userId));
String postName = tzsUserInfoMapper.selectPostNameByUserId(userId);
Map<String, Object> result = new HashMap<>();
result.put("postName", tzsUserInfo.getPostName());
result.put("postName", ObjectUtils.isEmpty(postName) ? null : postName);
return result;
}
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment