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

Merge branch 'master' into docker_package

This commit is contained in:
wangliwen 2023-01-10 18:19:35 +08:00
parent 596b7e0db4 ef790fd82c
commit 07b5892265
10 changed files with 531 additions and 508 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
renren-admin/src/main/java/io/renren/modules/processForm/controller/TAbilityApplicationController.java
View File

@ -805,6 +805,12 @@ public class TAbilityApplicationController {
temp.put("system", index.getSystem()); temp.put("system", index.getSystem());
temp.put("resourceId", index.getResourceId()); temp.put("resourceId", index.getResourceId());
ResourceDTO resourceDTO = resourceService.get(Long.parseLong(index.getResourceId())); ResourceDTO resourceDTO = resourceService.get(Long.parseLong(index.getResourceId()));
try {
temp.put("resourceDept", sysDeptService.get(resourceDTO.getDeptId()).getName());
} catch (Exception exception) {
temp.put("resourceDept", "-");
}
temp.put("description", resourceDTO.getDescription());
if ("应用资源".equals(resourceDTO.getType())) { if ("应用资源".equals(resourceDTO.getType())) {
temp.put("resourceTYpe", "应用资源"); temp.put("resourceTYpe", "应用资源");
} else if ("组件服务".equals(resourceDTO.getType())) { } else if ("组件服务".equals(resourceDTO.getType())) {

4
renren-admin/src/main/java/io/renren/modules/processForm/service/impl/TAbilityApplicationServiceImpl.java
View File

@ -85,9 +85,9 @@ public class TAbilityApplicationServiceImpl extends CrudServiceImpl<TAbilityAppl
String sql = "SELECT 1 FROM tb_resource_score t1 WHERE t1.user_id = t_ability_application.user_id AND t1.resource_id = t_ability_application.resource_id"; String sql = "SELECT 1 FROM tb_resource_score t1 WHERE t1.user_id = t_ability_application.user_id AND t1.resource_id = t_ability_application.resource_id";
String resource_sql = "SELECT 1 FROM tb_data_resource WHERE tb_data_resource.del_flag = 0 AND t_ability_application.resource_id = tb_data_resource.id"; String resource_sql = "SELECT 1 FROM tb_data_resource WHERE tb_data_resource.del_flag = 0 AND t_ability_application.resource_id = tb_data_resource.id";
if (score) { if (score) {
wrapper.exists(sql).exists(resource_sql).ne("approve_status", "不通过"); wrapper.exists(sql).exists(resource_sql).eq("approve_status", "通过");
} else { } else {
wrapper.notExists(sql).exists(resource_sql).ne("approve_status", "不通过"); wrapper.notExists(sql).exists(resource_sql).eq("approve_status", "通过");
} }
break; break;
} }

2
renren-admin/src/main/resources/mapper/activiti/ProcessActivityDao.xml
View File

@ -44,7 +44,7 @@
LEFT JOIN sys_user su ON ahp.START_USER_ID_ = su.id LEFT JOIN sys_user su ON ahp.START_USER_ID_ = su.id
WHERE WHERE
aht.ASSIGNEE_ = #{userId} aht.ASSIGNEE_ = #{userId}
<if test="userName != null and userName != ''" > <if test="userName != null and userName != ''">
and su.real_name like CONCAT('%', #{userName} ,'%') and su.real_name like CONCAT('%', #{userName} ,'%')
</if> </if>
<if test="processInstanceId != null"> <if test="processInstanceId != null">

2
renren-admin/src/main/resources/mapper/demanData/TDemandDataDao.xml
View File

@ -23,7 +23,7 @@
<result property="approvalUserDeptName" column="approval_user_dept_name"/> <result property="approvalUserDeptName" column="approval_user_dept_name"/>
<result property="visits" column="visits"/> <result property="visits" column="visits"/>
<result property="applyNumber" column="apply_number"/> <result property="applyNumber" column="apply_number"/>
<result property="enclosureName" column="enclosure_name" /> <result property="enclosureName" column="enclosure_name"/>
</resultMap> </resultMap>
<update id="updateInstanceId"> <update id="updateInstanceId">

3
renren-admin/src/main/resources/mapper/fuse/TbFuseDao.xml
View File

@ -33,7 +33,8 @@
trc.user_id = #{userId})>0 , 'true', 'false') as isCollect trc.user_id = #{userId})>0 , 'true', 'false') as isCollect
FROM FROM
tb_fuse tf tb_fuse tf
LEFT JOIN ( SELECT id, resource_Id, user_id FROM tb_resource_collection WHERE 1 = 1 AND del_flag = 0 ) trc ON tf.id = trc.resource_id LEFT JOIN ( SELECT id, resource_Id, user_id FROM tb_resource_collection WHERE 1 = 1 AND del_flag = 0 ) trc ON
tf.id = trc.resource_id
WHERE WHERE
1 =1 1 =1
<if test="name != null and name != ''"> <if test="name != null and name != ''">

135
renren-admin/src/main/resources/mapper/processForm/TAbilityApplicationDao.xml
View File

@ -345,14 +345,16 @@
SELECT SELECT
COUNT( 1 ) COUNT( 1 )
FROM FROM
( SELECT id FROM t_ability_application WHERE user_id = #{userId} AND resource_id = #{resourceId} AND IFNULL( expire_date > #{today}, 1 ) > 0 ) temp ( SELECT id FROM t_ability_application WHERE user_id = #{userId} AND resource_id = #{resourceId} AND IFNULL(
expire_date > #{today}, 1 ) > 0 ) temp
</select> </select>
<select id="getFundStatement" resultType="java.util.Map"> <select id="getFundStatement" resultType="java.util.Map">
SELECT SELECT
taa.id, taa.id,
tdr.NAME AS "resourceName", tdr.NAME AS "resourceName",
( CASE tdr.type WHEN '应用资源' THEN tdr.type WHEN '组件服务' THEN attr.attr_value ELSE tdr.type END ) AS "resourceType", ( CASE tdr.type WHEN '应用资源' THEN tdr.type WHEN '组件服务' THEN attr.attr_value ELSE tdr.type END ) AS
"resourceType",
sd.NAME AS "provideDept", sd.NAME AS "provideDept",
taa.unit AS "applyDept", taa.unit AS "applyDept",
taa.create_date AS "applyDate", taa.create_date AS "applyDate",
@ -362,7 +364,8 @@
t_ability_application taa t_ability_application taa
LEFT JOIN tb_data_resource tdr ON taa.resource_id = tdr.id LEFT JOIN tb_data_resource tdr ON taa.resource_id = tdr.id
LEFT JOIN sys_dept sd ON tdr.dept_id = sd.id LEFT JOIN sys_dept sd ON tdr.dept_id = sd.id
LEFT JOIN ( SELECT data_resource_id, attr_type, attr_value FROM tb_data_attr tda WHERE del_flag = 0 AND attr_type = '组件类型' ) attr ON tdr.id = attr.data_resource_id LEFT JOIN ( SELECT data_resource_id, attr_type, attr_value FROM tb_data_attr tda WHERE del_flag = 0 AND
attr_type = '组件类型' ) attr ON tdr.id = attr.data_resource_id
WHERE WHERE
1 = 1 1 = 1
AND tdr.del_flag = 0 AND tdr.del_flag = 0
@ -378,23 +381,24 @@
</choose> </choose>
AND taa.del_flag = 0 AND taa.del_flag = 0
AND tdr.del_flag = 0 AND tdr.del_flag = 0
<if test = "params.startDate != null and params.startDate != ''" > <if test="params.startDate != null and params.startDate != ''">
AND taa.create_date >= #{params.startDate} AND taa.create_date >= #{params.startDate}
</if> </if>
<if test = "params.endDate != null and params.endDate != ''" > <if test="params.endDate != null and params.endDate != ''">
AND #{params.endDate} >= taa.create_date AND #{params.endDate} >= taa.create_date
</if> </if>
<if test = "params.provideDept != null and params.provideDept != ''" > <if test="params.provideDept != null and params.provideDept != ''">
AND sd.id = #{params.provideDept} AND sd.id = #{params.provideDept}
</if> </if>
<if test = "params.applyDept != null and params.applyDept != ''" > <if test="params.applyDept != null and params.applyDept != ''">
AND taa.unit LIKE CONCAT('%', #{params.applyDept} ,'%') AND taa.unit LIKE CONCAT('%', #{params.applyDept} ,'%')
</if> </if>
<if test = "params.resourceName != null and params.resourceName != ''" > <if test="params.resourceName != null and params.resourceName != ''">
AND tdr.NAME LIKE CONCAT('%', #{params.resourceName} ,'%') AND tdr.NAME LIKE CONCAT('%', #{params.resourceName} ,'%')
</if> </if>
<if test = "params.resourceType != null and params.resourceType != ''" > <if test="params.resourceType != null and params.resourceType != ''">
AND ( CASE tdr.type WHEN '应用资源' THEN tdr.type WHEN '组件服务' THEN attr.attr_value ELSE tdr.type END ) = #{params.resourceType} AND ( CASE tdr.type WHEN '应用资源' THEN tdr.type WHEN '组件服务' THEN attr.attr_value ELSE tdr.type END ) =
#{params.resourceType}
</if> </if>
UNION ALL UNION ALL
@ -423,22 +427,22 @@
AND tmb.state IN (0, 2) AND tmb.state IN (0, 2)
</otherwise> </otherwise>
</choose> </choose>
<if test = "params.startDate != null and params.startDate != ''" > <if test="params.startDate != null and params.startDate != ''">
AND tmb.create_date >= #{params.startDate} AND tmb.create_date >= #{params.startDate}
</if> </if>
<if test = "params.endDate != null and params.endDate != ''" > <if test="params.endDate != null and params.endDate != ''">
AND #{params.endDate} >= tmb.create_date AND #{params.endDate} >= tmb.create_date
</if> </if>
<if test = "params.provideDept != null and params.provideDept != ''" > <if test="params.provideDept != null and params.provideDept != ''">
AND 1067246875800000066 = #{params.provideDept} AND 1067246875800000066 = #{params.provideDept}
</if> </if>
<if test = "params.applyDept != null and params.applyDept != ''" > <if test="params.applyDept != null and params.applyDept != ''">
AND tmb.dept LIKE CONCAT('%', #{params.applyDept} ,'%') AND tmb.dept LIKE CONCAT('%', #{params.applyDept} ,'%')
</if> </if>
<if test = "params.resourceName != null and params.resourceName != ''" > <if test="params.resourceName != null and params.resourceName != ''">
AND tm.NAME LIKE CONCAT('%', #{params.resourceName} ,'%') AND tm.NAME LIKE CONCAT('%', #{params.resourceName} ,'%')
</if> </if>
<if test = "params.resourceType != null and params.resourceType != ''" > <if test="params.resourceType != null and params.resourceType != ''">
AND '会客厅' = #{params.resourceType} AND '会客厅' = #{params.resourceType}
</if> </if>
ORDER BY applyDate DESC ORDER BY applyDate DESC
@ -453,7 +457,8 @@
t_ability_application taa t_ability_application taa
LEFT JOIN tb_data_resource tdr ON taa.resource_id = tdr.id LEFT JOIN tb_data_resource tdr ON taa.resource_id = tdr.id
LEFT JOIN sys_dept sd ON tdr.dept_id = sd.id LEFT JOIN sys_dept sd ON tdr.dept_id = sd.id
LEFT JOIN ( SELECT data_resource_id, attr_type, attr_value FROM tb_data_attr tda WHERE del_flag = 0 AND attr_type = '组件类型' ) attr ON tdr.id = attr.data_resource_id LEFT JOIN ( SELECT data_resource_id, attr_type, attr_value FROM tb_data_attr tda WHERE del_flag = 0 AND
attr_type = '组件类型' ) attr ON tdr.id = attr.data_resource_id
WHERE WHERE
1 = 1 1 = 1
AND tdr.del_flag = 0 AND tdr.del_flag = 0
@ -469,23 +474,24 @@
</choose> </choose>
AND taa.del_flag = 0 AND taa.del_flag = 0
AND tdr.del_flag = 0 AND tdr.del_flag = 0
<if test = "params.startDate != null and params.startDate != ''" > <if test="params.startDate != null and params.startDate != ''">
AND taa.create_date >= #{params.startDate} AND taa.create_date >= #{params.startDate}
</if> </if>
<if test = "params.endDate != null and params.endDate != ''" > <if test="params.endDate != null and params.endDate != ''">
AND #{params.endDate} >= taa.create_date AND #{params.endDate} >= taa.create_date
</if> </if>
<if test = "params.provideDept != null and params.provideDept != ''" > <if test="params.provideDept != null and params.provideDept != ''">
AND sd.id = #{params.provideDept} AND sd.id = #{params.provideDept}
</if> </if>
<if test = "params.applyDept != null and params.applyDept != ''" > <if test="params.applyDept != null and params.applyDept != ''">
AND taa.unit LIKE CONCAT('%', #{params.applyDept} ,'%') AND taa.unit LIKE CONCAT('%', #{params.applyDept} ,'%')
</if> </if>
<if test = "params.resourceName != null and params.resourceName != ''" > <if test="params.resourceName != null and params.resourceName != ''">
AND tdr.NAME LIKE CONCAT('%', #{params.resourceName} ,'%') AND tdr.NAME LIKE CONCAT('%', #{params.resourceName} ,'%')
</if> </if>
<if test = "params.resourceType != null and params.resourceType != ''" > <if test="params.resourceType != null and params.resourceType != ''">
AND ( CASE tdr.type WHEN '应用资源' THEN tdr.type WHEN '组件服务' THEN attr.attr_value ELSE tdr.type END ) = #{params.resourceType} AND ( CASE tdr.type WHEN '应用资源' THEN tdr.type WHEN '组件服务' THEN attr.attr_value ELSE tdr.type END ) =
#{params.resourceType}
</if> </if>
UNION ALL UNION ALL
@ -507,22 +513,22 @@
AND tmb.state IN (0, 2) AND tmb.state IN (0, 2)
</otherwise> </otherwise>
</choose> </choose>
<if test = "params.startDate != null and params.startDate != ''" > <if test="params.startDate != null and params.startDate != ''">
AND tmb.create_date >= #{params.startDate} AND tmb.create_date >= #{params.startDate}
</if> </if>
<if test = "params.endDate != null and params.endDate != ''" > <if test="params.endDate != null and params.endDate != ''">
AND #{params.endDate} >= tmb.create_date AND #{params.endDate} >= tmb.create_date
</if> </if>
<if test = "params.provideDept != null and params.provideDept != ''" > <if test="params.provideDept != null and params.provideDept != ''">
AND 1067246875800000066 = #{params.provideDept} AND 1067246875800000066 = #{params.provideDept}
</if> </if>
<if test = "params.applyDept != null and params.applyDept != ''" > <if test="params.applyDept != null and params.applyDept != ''">
AND tmb.dept LIKE CONCAT('%', #{params.applyDept} ,'%') AND tmb.dept LIKE CONCAT('%', #{params.applyDept} ,'%')
</if> </if>
<if test = "params.resourceName != null and params.resourceName != ''" > <if test="params.resourceName != null and params.resourceName != ''">
AND tm.NAME LIKE CONCAT('%', #{params.resourceName} ,'%') AND tm.NAME LIKE CONCAT('%', #{params.resourceName} ,'%')
</if> </if>
<if test = "params.resourceType != null and params.resourceType != ''" > <if test="params.resourceType != null and params.resourceType != ''">
AND '会客厅' = #{params.resourceType} AND '会客厅' = #{params.resourceType}
</if> </if>
) temp ) temp
@ -532,7 +538,8 @@
SELECT SELECT
taa.id, taa.id,
tdr.NAME AS "resourceName", tdr.NAME AS "resourceName",
( CASE tdr.type WHEN '应用资源' THEN tdr.type WHEN '组件服务' THEN attr.attr_value ELSE tdr.type END ) AS "resourceType", ( CASE tdr.type WHEN '应用资源' THEN tdr.type WHEN '组件服务' THEN attr.attr_value ELSE tdr.type END ) AS
"resourceType",
sd.NAME AS "provideDept", sd.NAME AS "provideDept",
taa.unit AS "applyDept", taa.unit AS "applyDept",
date_format(taa.create_date, "%Y-%m-%d %h:%i:%s") AS "applyDate", date_format(taa.create_date, "%Y-%m-%d %h:%i:%s") AS "applyDate",
@ -542,7 +549,8 @@
t_ability_application taa t_ability_application taa
LEFT JOIN tb_data_resource tdr ON taa.resource_id = tdr.id LEFT JOIN tb_data_resource tdr ON taa.resource_id = tdr.id
LEFT JOIN sys_dept sd ON tdr.dept_id = sd.id LEFT JOIN sys_dept sd ON tdr.dept_id = sd.id
LEFT JOIN ( SELECT data_resource_id, attr_type, attr_value FROM tb_data_attr tda WHERE del_flag = 0 AND attr_type = '组件类型' ) attr ON tdr.id = attr.data_resource_id LEFT JOIN ( SELECT data_resource_id, attr_type, attr_value FROM tb_data_attr tda WHERE del_flag = 0 AND
attr_type = '组件类型' ) attr ON tdr.id = attr.data_resource_id
WHERE WHERE
1 = 1 1 = 1
AND tdr.del_flag = 0 AND tdr.del_flag = 0
@ -558,23 +566,24 @@
</choose> </choose>
AND taa.del_flag = 0 AND taa.del_flag = 0
AND tdr.del_flag = 0 AND tdr.del_flag = 0
<if test = "params.startDate != null and params.startDate != ''" > <if test="params.startDate != null and params.startDate != ''">
AND taa.create_date >= #{params.startDate} AND taa.create_date >= #{params.startDate}
</if> </if>
<if test = "params.endDate != null and params.endDate != ''" > <if test="params.endDate != null and params.endDate != ''">
AND #{params.endDate} >= taa.create_date AND #{params.endDate} >= taa.create_date
</if> </if>
<if test = "params.provideDept != null and params.provideDept != ''" > <if test="params.provideDept != null and params.provideDept != ''">
AND sd.id = #{params.provideDept} AND sd.id = #{params.provideDept}
</if> </if>
<if test = "params.applyDept != null and params.applyDept != ''" > <if test="params.applyDept != null and params.applyDept != ''">
AND taa.unit LIKE CONCAT('%', #{params.applyDept} ,'%') AND taa.unit LIKE CONCAT('%', #{params.applyDept} ,'%')
</if> </if>
<if test = "params.resourceName != null and params.resourceName != ''" > <if test="params.resourceName != null and params.resourceName != ''">
AND tdr.NAME LIKE CONCAT('%', #{params.resourceName} ,'%') AND tdr.NAME LIKE CONCAT('%', #{params.resourceName} ,'%')
</if> </if>
<if test = "params.resourceType != null and params.resourceType != ''" > <if test="params.resourceType != null and params.resourceType != ''">
AND ( CASE tdr.type WHEN '应用资源' THEN tdr.type WHEN '组件服务' THEN attr.attr_value ELSE tdr.type END ) = #{params.resourceType} AND ( CASE tdr.type WHEN '应用资源' THEN tdr.type WHEN '组件服务' THEN attr.attr_value ELSE tdr.type END ) =
#{params.resourceType}
</if> </if>
UNION ALL UNION ALL
@ -604,22 +613,22 @@
AND tmb.state IN (0, 2) AND tmb.state IN (0, 2)
</otherwise> </otherwise>
</choose> </choose>
<if test = "params.startDate != null and params.startDate != ''" > <if test="params.startDate != null and params.startDate != ''">
AND tmb.create_date >= #{params.startDate} AND tmb.create_date >= #{params.startDate}
</if> </if>
<if test = "params.endDate != null and params.endDate != ''" > <if test="params.endDate != null and params.endDate != ''">
AND #{params.endDate} >= tmb.create_date AND #{params.endDate} >= tmb.create_date
</if> </if>
<if test = "params.provideDept != null and params.provideDept != ''" > <if test="params.provideDept != null and params.provideDept != ''">
AND 1067246875800000066 = #{params.provideDept} AND 1067246875800000066 = #{params.provideDept}
</if> </if>
<if test = "params.applyDept != null and params.applyDept != ''" > <if test="params.applyDept != null and params.applyDept != ''">
AND tmb.dept LIKE CONCAT('%', #{params.applyDept} ,'%') AND tmb.dept LIKE CONCAT('%', #{params.applyDept} ,'%')
</if> </if>
<if test = "params.resourceName != null and params.resourceName != ''" > <if test="params.resourceName != null and params.resourceName != ''">
AND tm.NAME LIKE CONCAT('%', #{params.resourceName} ,'%') AND tm.NAME LIKE CONCAT('%', #{params.resourceName} ,'%')
</if> </if>
<if test = "params.resourceType != null and params.resourceType != ''" > <if test="params.resourceType != null and params.resourceType != ''">
AND '会客厅' = #{params.resourceType} AND '会客厅' = #{params.resourceType}
</if> </if>
ORDER BY applyDate DESC ORDER BY applyDate DESC
@ -633,7 +642,8 @@
t_ability_application taa t_ability_application taa
LEFT JOIN tb_data_resource tdr ON taa.resource_id = tdr.id LEFT JOIN tb_data_resource tdr ON taa.resource_id = tdr.id
LEFT JOIN sys_dept sd ON tdr.dept_id = sd.id LEFT JOIN sys_dept sd ON tdr.dept_id = sd.id
LEFT JOIN ( SELECT data_resource_id, attr_type, attr_value FROM tb_data_attr tda WHERE del_flag = 0 AND attr_type = '组件类型' ) attr ON tdr.id = attr.data_resource_id LEFT JOIN ( SELECT data_resource_id, attr_type, attr_value FROM tb_data_attr tda WHERE del_flag = 0 AND
attr_type = '组件类型' ) attr ON tdr.id = attr.data_resource_id
WHERE WHERE
1 = 1 1 = 1
AND tdr.del_flag = 0 AND tdr.del_flag = 0
@ -649,23 +659,24 @@
</choose> </choose>
AND taa.del_flag = 0 AND taa.del_flag = 0
AND tdr.del_flag = 0 AND tdr.del_flag = 0
<if test = "params.startDate != null and params.startDate != ''" > <if test="params.startDate != null and params.startDate != ''">
AND taa.create_date >= #{params.startDate} AND taa.create_date >= #{params.startDate}
</if> </if>
<if test = "params.endDate != null and params.endDate != ''" > <if test="params.endDate != null and params.endDate != ''">
AND #{params.endDate} >= taa.create_date AND #{params.endDate} >= taa.create_date
</if> </if>
<if test = "params.provideDept != null and params.provideDept != ''" > <if test="params.provideDept != null and params.provideDept != ''">
AND sd.id = #{params.provideDept} AND sd.id = #{params.provideDept}
</if> </if>
<if test = "params.applyDept != null and params.applyDept != ''" > <if test="params.applyDept != null and params.applyDept != ''">
AND taa.unit LIKE CONCAT('%', #{params.applyDept} ,'%') AND taa.unit LIKE CONCAT('%', #{params.applyDept} ,'%')
</if> </if>
<if test = "params.resourceName != null and params.resourceName != ''" > <if test="params.resourceName != null and params.resourceName != ''">
AND tdr.NAME LIKE CONCAT('%', #{params.resourceName} ,'%') AND tdr.NAME LIKE CONCAT('%', #{params.resourceName} ,'%')
</if> </if>
<if test = "params.resourceType != null and params.resourceType != ''" > <if test="params.resourceType != null and params.resourceType != ''">
AND ( CASE tdr.type WHEN '应用资源' THEN tdr.type WHEN '组件服务' THEN attr.attr_value ELSE tdr.type END ) = #{params.resourceType} AND ( CASE tdr.type WHEN '应用资源' THEN tdr.type WHEN '组件服务' THEN attr.attr_value ELSE tdr.type END ) =
#{params.resourceType}
</if> </if>
UNION ALL UNION ALL
@ -689,22 +700,22 @@
AND tmb.state IN (0, 2) AND tmb.state IN (0, 2)
</otherwise> </otherwise>
</choose> </choose>
<if test = "params.startDate != null and params.startDate != ''" > <if test="params.startDate != null and params.startDate != ''">
AND tmb.create_date >= #{params.startDate} AND tmb.create_date >= #{params.startDate}
</if> </if>
<if test = "params.endDate != null and params.endDate != ''" > <if test="params.endDate != null and params.endDate != ''">
AND #{params.endDate} >= tmb.create_date AND #{params.endDate} >= tmb.create_date
</if> </if>
<if test = "params.provideDept != null and params.provideDept != ''" > <if test="params.provideDept != null and params.provideDept != ''">
AND 1067246875800000066 = #{params.provideDept} AND 1067246875800000066 = #{params.provideDept}
</if> </if>
<if test = "params.applyDept != null and params.applyDept != ''" > <if test="params.applyDept != null and params.applyDept != ''">
AND tmb.dept LIKE CONCAT('%', #{params.applyDept} ,'%') AND tmb.dept LIKE CONCAT('%', #{params.applyDept} ,'%')
</if> </if>
<if test = "params.resourceName != null and params.resourceName != ''" > <if test="params.resourceName != null and params.resourceName != ''">
AND tm.NAME LIKE CONCAT('%', #{params.resourceName} ,'%') AND tm.NAME LIKE CONCAT('%', #{params.resourceName} ,'%')
</if> </if>
<if test = "params.resourceType != null and params.resourceType != ''" > <if test="params.resourceType != null and params.resourceType != ''">
AND '会客厅' = #{params.resourceType} AND '会客厅' = #{params.resourceType}
</if> </if>
) temp ) temp
@ -982,9 +993,11 @@
( SELECT id, NAME, sort FROM sys_region WHERE tree_level = 3 AND 9 >= sort ) srg ( SELECT id, NAME, sort FROM sys_region WHERE tree_level = 3 AND 9 >= sort ) srg
LEFT JOIN sys_dept sd ON sd.district = srg.id LEFT JOIN sys_dept sd ON sd.district = srg.id
LEFT JOIN tb_data_resource tdr ON tdr.dept_id = sd.id LEFT JOIN tb_data_resource tdr ON tdr.dept_id = sd.id
LEFT JOIN (SELECT resource_id, SUM(apply_price) AS "apply_price", COUNT(id) AS "applyCount" FROM t_ability_application taa WHERE LEFT JOIN (SELECT resource_id, SUM(apply_price) AS "apply_price", COUNT(id) AS "applyCount" FROM
t_ability_application taa WHERE
taa.del_flag = 0 taa.del_flag = 0
AND taa.approve_status = '通过' AND (taa.camera_list IS NULL OR taa.camera_list = '') GROUP BY resource_id ) taa ON taa.resource_id = tdr.id AND taa.approve_status = '通过' AND (taa.camera_list IS NULL OR taa.camera_list = '') GROUP BY resource_id ) taa
ON taa.resource_id = tdr.id
GROUP BY GROUP BY
srg.id srg.id
ORDER BY srg.sort ORDER BY srg.sort

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

@ -2116,7 +2116,8 @@
tb_data_attr a tb_data_attr a
INNER JOIN mysql.help_topic b ON a.attr_type = '应用领域' INNER JOIN mysql.help_topic b ON a.attr_type = '应用领域'
AND a.del_flag = 0 AND a.del_flag = 0
AND b.help_topic_id &lt; ( length( a.attr_value ) - length( REPLACE ( a.attr_value, ';', '' )) + 1 )) tda ON tdr.id = tda.data_resource_id AND b.help_topic_id &lt; ( length( a.attr_value ) - length( REPLACE ( a.attr_value, ';', '' )) + 1 )) tda ON
tdr.id = tda.data_resource_id
LEFT JOIN ( LEFT JOIN (
SELECT SELECT
sdd.sort, sdd.sort,
@ -2400,7 +2401,8 @@
AND tdr.id IN AND tdr.id IN
<foreach collection="resourceIds" item="id" open="(" separator="," close=")"> <foreach collection="resourceIds" item="id" open="(" separator="," close=")">
#{id} #{id}
</foreach> UNION ALL </foreach>
UNION ALL
SELECT DISTINCT SELECT DISTINCT
tda.attr_value tda.attr_value
FROM FROM

32
renren-admin/src/main/resources/mapper/sys/SysUserDao.xml
View File

@ -261,22 +261,22 @@
LIMIT ${pageNum}, ${pageSize} LIMIT ${pageNum}, ${pageSize}
</select> </select>
<select id="getUserByRoleListCount" resultType="java.lang.Long"> <select id="getUserByRoleListCount" resultType="java.lang.Long">
<!-- SELECT--> <!-- SELECT-->
<!-- COUNT(DISTINCT sys_user.id )--> <!-- COUNT(DISTINCT sys_user.id )-->
<!-- FROM--> <!-- FROM-->
<!-- sys_role_user--> <!-- sys_role_user-->
<!-- LEFT JOIN sys_user ON sys_user.id = sys_role_user.user_id--> <!-- LEFT JOIN sys_user ON sys_user.id = sys_role_user.user_id-->
<!-- LEFT JOIN sys_dept ON sys_dept.id = sys_user.dept_id--> <!-- LEFT JOIN sys_dept ON sys_dept.id = sys_user.dept_id-->
<!-- WHERE--> <!-- WHERE-->
<!-- 1 = 1--> <!-- 1 = 1-->
<!-- AND sys_role_user.del_flag = 0--> <!-- AND sys_role_user.del_flag = 0-->
<!-- AND sys_user.id IS NOT NULL--> <!-- AND sys_user.id IS NOT NULL-->
<!-- <if test="null != roleIds">--> <!-- <if test="null != roleIds">-->
<!-- AND sys_role_user.role_id IN--> <!-- AND sys_role_user.role_id IN-->
<!-- <foreach item="roleId" collection="roleIds" open="(" separator="," close=")">--> <!-- <foreach item="roleId" collection="roleIds" open="(" separator="," close=")">-->
<!-- #{roleId}--> <!-- #{roleId}-->
<!-- </foreach>--> <!-- </foreach>-->
<!-- </if>--> <!-- </if>-->
SELECT SELECT
COUNT(temp.id) COUNT(temp.id)

3
renren-admin/src/main/resources/mapper/sysnoticemanagement/SysNoticeManagementDao.xml
View File

@ -3,7 +3,8 @@
<mapper namespace="io.renren.modules.sysnoticemanagement.dao.SysNoticeManagementDao"> <mapper namespace="io.renren.modules.sysnoticemanagement.dao.SysNoticeManagementDao">
<resultMap type="io.renren.modules.sysnoticemanagement.entity.SysNoticeManagementEntity" id="sysNoticeManagementMap"> <resultMap type="io.renren.modules.sysnoticemanagement.entity.SysNoticeManagementEntity"
id="sysNoticeManagementMap">
<result property="id" column="id"/> <result property="id" column="id"/>
<result property="content" column="content"/> <result property="content" column="content"/>
<result property="publishTime" column="publish_time"/> <result property="publishTime" column="publish_time"/>