Merge branch 'master' into docker_package
This commit is contained in:
commit
d3dde53310
|
@ -102,7 +102,7 @@ public class AbilityCenterControllerV3 {
|
|||
}
|
||||
// 前端传了部门id,更新该用户部门id
|
||||
if (abilityBatchApplicationDTO.getDeptId() != null) {
|
||||
jdbcTemplate.update(String.format("UPDATE sys_user SET dept_id = %d WHERE id = %d;", abilityBatchApplicationDTO.getDeptId(), abilityBatchApplicationDTO.getUserId()));
|
||||
jdbcTemplate.update(String.format("UPDATE sys_user SET dept_id = %d WHERE id = %s;", abilityBatchApplicationDTO.getDeptId(), abilityBatchApplicationDTO.getUserId()));
|
||||
}
|
||||
List<Map<String, Object>> system_ = jdbcTemplate.queryForList("SELECT `name` AS resourceName,id AS resourceId FROM tb_data_resource WHERE type = '应用资源' AND del_flag = 0;");
|
||||
if (system_.isEmpty()) {
|
||||
|
@ -145,7 +145,7 @@ public class AbilityCenterControllerV3 {
|
|||
}
|
||||
// 前端传了部门id,更新该用户部门id
|
||||
if (abilityBatchApplicationDTO.getDeptId() != null) {
|
||||
jdbcTemplate.update(String.format("UPDATE sys_user SET dept_id = %d WHERE id = %d;", abilityBatchApplicationDTO.getDeptId(), abilityBatchApplicationDTO.getUserId()));
|
||||
jdbcTemplate.update(String.format("UPDATE sys_user SET dept_id = %d WHERE id = %s;", abilityBatchApplicationDTO.getDeptId(), abilityBatchApplicationDTO.getUserId()));
|
||||
}
|
||||
final String applyFlag = UUID.randomUUID().toString();
|
||||
abilityBatchApplicationDTO.setApplyFlag(applyFlag); // 同一次的申请标识
|
||||
|
|
Loading…
Reference in New Issue