|
@@ -41,7 +41,15 @@ public class AppConflictResolutionController extends BaseController {
|
|
|
*/
|
|
|
@GetMapping("/conflict/edit")
|
|
|
public AjaxResult getInfo(String id) {
|
|
|
- return remoteConflictResolutionService.selectConflictResolutionById(id);
|
|
|
+ ConflictResolution conflictResolution = remoteConflictResolutionService.selectConflictResolutionById(id);
|
|
|
+ if (!conflictResolution.getResolutionSuccess().isEmpty()) {
|
|
|
+ if (conflictResolution.getResolutionSuccess().equals("1")){
|
|
|
+ conflictResolution.setResolutionSuccessLabel("是");
|
|
|
+ }else {
|
|
|
+ conflictResolution.setResolutionSuccessLabel("否");
|
|
|
+ }
|
|
|
+ }
|
|
|
+ return AjaxResult.success(conflictResolution);
|
|
|
}
|
|
|
|
|
|
/**
|