Merge branch 'version_performance_2.0' of http://gitlab.ldxinyong.com/enterpriseManagement/lz_management into version_performance_2.0

This commit is contained in:
杜建超 2020-11-13 17:40:17 +08:00
commit d3a1dd4646
3 changed files with 4 additions and 3 deletions

View File

@ -54,6 +54,7 @@ public class ShiroConfig {
filterMap.put("/file/**", "anon");
filterMap.put("/test/**", "anon");
filterMap.put("/druid/**", "anon");
filterMap.put("/user/lzresultrecord/new/resultRecordDetail/**", "anon");
filterMap.put("/app/**", "anon");
filterMap.put("/sys/login", "anon");
filterMap.put("/sys/sendSMS", "anon");

View File

@ -1091,7 +1091,7 @@ public class ResultRecordController extends AbstractController {
*
* 删除
*/
// http://localhost:8080/lz_management/user/lzresultrecord/new/resultRecordDetail?resultRecordId=491&loginUserId=408
// http://localhost:8080/lz_management/user/lzresultrecord/new/resultRecordDetail?resultRecordId=593&loginUserId=322
@RequestMapping("/new/resultRecordDetail")
public R newResultRecordList(RecordDetailDto recordDetailDto) {
if(recordDetailDto.getLoginUserId() ==null && getUser() !=null ){

View File

@ -1198,8 +1198,8 @@ public class ResultRecordServiceImpl extends ServiceImpl<ResultRecordMapper, Res
}
if(currentResultRecord !=null){
if(StringUtil.isNotBlank(currentResultRecord.getFlowStaffIdRole())){
auth = getAuth(currentFlowRecord.getFlowStaffIdRole());
flowRecordId = currentFlowRecord.getId();
auth = getAuth(currentResultRecord.getFlowStaffIdRole());
flowRecordId = currentResultRecord.getId();
}
}
}