操作日志

src/main/java/common/controller/UserLogController.java

@@ -53,10 +53,10 @@ public class UserLogController
 
     @RequestMapping(value = "change/del/recover", method = RequestMethod.GET)
     @ResponseBody
-    public ResultModel changesDelRecover( @PathVariable String platform,@CurrentAccount User loginAccount,
+    public ResultModel changesDelRecover( @CurrentAccount User loginAccount,
                                           HttpServletRequest request,String id,String type) {
 
-        return ResultModel.OK(service.changesDelRecover(platform,id,type,loginAccount));
+        return ResultModel.OK(service.changesDelRecover(id,type,loginAccount));
 
     }
 }

src/main/java/common/service/ContractService.java

@@ -69,5 +69,5 @@ public interface ContractService {
 
     List<ChangeDelDetail> getChangeDelDetailData(User loginAccount, String pid);
 
-    ChangeDelInfo changesDelRecover(String platform, String id, String type, User loginAccount);
+    ChangeDelInfo changesDelRecover(String id, String type, User loginAccount);
 }
\ No newline at end of file

src/main/java/common/service/impl/ContractServiceImpl.java

@@ -1406,7 +1406,7 @@ public class ContractServiceImpl implements ContractService {
 
 
     @Override
-    public ChangeDelInfo changesDelRecover(String platform, String id, String type, User loginAccount) {
+    public ChangeDelInfo changesDelRecover(String id, String type, User loginAccount) {
         // 恢复删除
 
         ChangeDelInfo changeDelInfo = changeDelInfoRepository.findOne(Long.parseLong(id));
@@ -1440,6 +1440,8 @@ public class ContractServiceImpl implements ContractService {
                 contractRepository.save(contract);
 
             }
+
+            changeDelInfoRepository.delete(changeDelInfo);
         }
 
         return null;