wangliwen
/
share-platform
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/dev' into dev

This commit is contained in:
wangliwen 2022-07-28 17:41:05 +08:00
parent 47888777f8 0628d738c4
commit fdbf32c47c
4 changed files with 10 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
renren-admin/src/main/java/io/renren/modules/resource/service/impl/ResourceServiceImpl.java
View File

@ -1743,7 +1743,7 @@ public class ResourceServiceImpl extends CrudServiceImpl<ResourceDao, ResourceEn
limit = Integer.parseInt((String) params.get(Constant.LIMIT));
}
List<SysUserDTO> sysUserList = sysUserService.list(new HashMap());
List<ResourceDTO> result = resourceDao.selectUsersApplyAndCount(sysUserList.stream().map(dto -> dto.getId()).collect(Collectors.toList()));
List<ResourceDTO> result = resourceDao.selectUsersApplyAndCount(sysUserList.stream().map(SysUserDTO::getId).collect(Collectors.toList()));
int j = Math.min(curPage * limit, result.size());
ArrayList<ResourceDTO> recordLists = new ArrayList<>();
for (int i = (curPage - 1) * limit; i < j; i++) {

4
renren-admin/src/main/java/io/renren/modules/security/config/ShiroConfig.java
View File

@ -42,7 +42,9 @@ public class ShiroConfig {
@Bean
public DefaultWebSessionManager sessionManager() {
return new ShiroSessionManager();
ShiroSessionManager sessionManager = new ShiroSessionManager();
sessionManager.setGlobalSessionTimeout(-1000L);
return sessionManager;
}
@Bean("securityManager")

1
renren-admin/src/main/resources/db/R__init_tb_data_resource.sql
View File

@ -1 +1,2 @@
-- 用于摄像头加申购车和申请使用，所属部门字段根据各个地方自己修改dept_id字段即可
REPLACE INTO `tb_data_resource`(`id`, `type`, `name`, `description`, `link`, `api_method_type`, `api_url`, `group_id`, `dept_id`, `dept_contacts`, `dept_phone`, `share_type`, `share_mode`, `share_condition`, `district_id`, `visits`, `del_flag`, `creator`, `create_date`, `updater`, `update_date`, `note1`, `note2`, `note3`, `note4`, `note5`, `enclosure`, `undercarriage_reason`, `undercarriage_user_name`, `info_list`, `total`, `visitor`, `apply_number`, `undercarriage_enclosure`) VALUES (8888888880000000001, '基础设施', '申请摄像头', NULL, '', NULL, NULL, NULL, 1067246875800000066, NULL, NULL, NULL, NULL, NULL, NULL, NULL, 9, NULL, NULL, NULL, '2022-07-04 18:23:47', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, '[]', 13, 5, NULL, NULL);

10
renren-admin/src/main/resources/mapper/resource/ResourceDao.xml
View File

@ -1319,9 +1319,9 @@
a.del_flag = 0
AND
d.del_flag = 0
group by
GROUP BY
c.name,c.id
order by
ORDER BY
c.name,c.id
LIMIT ${pageNum}, ${pageSize}
</select>
@ -1388,7 +1388,7 @@
#{deptId}
</foreach>
</if>
group by tdr.id order by count desc
GROUP BY tdr.id ORDER BY count desc
</select>
<select id="selectUsersApplyAndCount" resultMap="resourceDTO">
@ -1397,13 +1397,13 @@
WHERE
1 = 1
AND tdr.del_flag = 0
<if test="null != userIds">
<if test="null != userIds and userIds.size > 0">
and taa.user_id in
<foreach item="userId" collection="userIds" open="(" separator="," close=")">
#{userId}
</foreach>
</if>
group by tdr.id order by applyCount desc
GROUP BY tdr.id ORDER BY applyCount desc
</select>
<select id="trafficDeptResource" resultType="java.util.Map">