Merge remote-tracking branch 'origin/master'

attendance-performance-manager/src/main/java/com/mortals/xhx/module/perform/service/impl/PerformDeptConfServiceImpl.java

@@ -98,4 +98,25 @@ public class PerformDeptConfServiceImpl extends AbstractCRUDServiceImpl<PerformD
             performDeptConfDetailService.save(entity.getDeptConfDetail(),context);
         }
     }
+
+    @Override
+    public PerformDeptConfEntity get(Long key, Context context) throws AppException {
+        PerformDeptConfEntity entity = this.dao.get(key);
+        if(entity!=null) {
+            List<PerformDeptConfDetailEntity> detailEntityList = performDeptConfDetailService.find(new PerformDeptConfDetailQuery().deptConfId(entity.getId()));
+            entity.setDeptConfDetail(detailEntityList);
+        }
+        return entity;
+    }
+
+    @Override
+    protected void removeAfter(Long[] ids, Context context, int result) throws AppException {
+        if(ids != null && ids.length != 0){
+            for (Long id:ids){
+                PerformDeptConfDetailEntity condition = new PerformDeptConfDetailEntity();
+                condition.setDeptConfId(id);
+                performDeptConfDetailService.remove(condition,context);
+            }
+        }
+    }
 }
\ No newline at end of file